aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile.local
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2010-10-30 13:20:33 -0700
committerGravatar Carl Worth <cworth@cworth.org>2010-10-30 13:20:33 -0700
commit6b9a717c26229accc6d871b3c7d77cb34d5a68ac (patch)
tree0f895d308c025eaba748ac07ccdc097cc82fa95e /Makefile.local
parente94db26c5c7250c82cc2e2445fbb58cdb41847de (diff)
configure: Add a check for the -Wl,--as-needed flag.
This fits with our general build philosophy of checking at configure time for desired support, (rather than putting platform-specific conditionals into our Makefiles).
Diffstat (limited to 'Makefile.local')
-rw-r--r--Makefile.local6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.local b/Makefile.local
index ef3a3544..490265b0 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -31,11 +31,9 @@ GPG_FILE=$(SHA1_FILE).asc
# Smash together user's values with our extra values
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(AS_NEEDED_LDFLAGS)
FINAL_NOTMUCH_LINKER = CC
-ifeq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
-FINAL_NOTMUCH_LDFLAGS += -Wl,--as-needed
-else
+ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
FINAL_NOTMUCH_LINKER = CXX
endif