diff options
| author | David Bremner <david@tethera.net> | 2015-06-01 09:09:00 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2015-06-13 17:52:48 +0200 |
| commit | 53035dafe060f6832909ad54e48277c8d3bd2d1b (patch) | |
| tree | d8f2df496253eefef0be0020a5174d6f201bb2d4 | |
| parent | 4e799034492ca28d65385afc94a35461fe25b426 (diff) | |
lib, ruby: make use of -Wl,--no-undefined configurable
In particular this is supposed to help build on systems (presumably
using a non-gnu ld) where this flag is not available.
| -rw-r--r-- | bindings/Makefile.local | 4 | ||||
| -rw-r--r-- | bindings/ruby/extconf.rb | 5 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | lib/Makefile.local | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/bindings/Makefile.local b/bindings/Makefile.local index 16817f5a..d236f014 100644 --- a/bindings/Makefile.local +++ b/bindings/Makefile.local @@ -5,7 +5,9 @@ dir := bindings # force the shared library to be built ruby-bindings: lib/libnotmuch.so ifeq ($(HAVE_RUBY_DEV),1) - cd $(dir)/ruby && ruby extconf.rb --vendor + cd $(dir)/ruby && \ + EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS)" \ + ruby extconf.rb --vendor $(MAKE) -C $(dir)/ruby else @echo Missing dependency, skipping ruby bindings diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb index 6160db26..6d5607e1 100644 --- a/bindings/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb @@ -10,8 +10,9 @@ dir = File.join('..', '..', 'lib') # includes $INCFLAGS = "-I#{dir} #{$INCFLAGS}" -# make sure there are no undefined symbols -$LDFLAGS += ' -Wl,--no-undefined' +if ENV['EXTRA_LDFLAGS'] + $LDFLAGS += " " + ENV['EXTRA_LDFLAGS'] +end def have_local_library(lib, path, func, headers = nil) checking_for checking_message(func, lib) do @@ -751,6 +751,16 @@ else as_needed_ldflags="" fi +printf "Checking for -Wl,--no-undefined... " +if ${CC} -Wl,--no-undefined -o minimal minimal.c >/dev/null 2>&1 +then + printf "Yes.\n" + no_undefined_ldflags="-Wl,--no-undefined" +else + printf "No (nothing to worry about).\n" + no_undefined_ldflags="" +fi + WARN_CXXFLAGS="" printf "Checking for available C++ compiler warning flags... " for flag in -Wall -Wextra -Wwrite-strings; do @@ -955,6 +965,9 @@ RPATH_LDFLAGS = ${rpath_ldflags} # Flags needed to have linker link only to necessary libraries AS_NEEDED_LDFLAGS = ${as_needed_ldflags} +# Flags to have the linker flag undefined symbols in object files +NO_UNDEFINED_LDFLAGS = ${no_undefined_ldflags} + # Whether valgrind header files are available HAVE_VALGRIND = ${have_valgrind} diff --git a/lib/Makefile.local b/lib/Makefile.local index f9ecd50e..b58b4e8a 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -33,7 +33,7 @@ LIBRARY_SUFFIX = so LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX) SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR) LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE) -LIBRARY_LINK_FLAG = -shared -Wl,--version-script=notmuch.sym,-soname=$(SONAME) -Wl,--no-undefined +LIBRARY_LINK_FLAG = -shared -Wl,--version-script=notmuch.sym,-soname=$(SONAME) $(NO_UNDEFINED_LDFLAGS) ifeq ($(PLATFORM),OPENBSD) LIBRARY_LINK_FLAG += -lc endif |