From 3d7af74ce512f4eed451ac86da3890397999d321 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 14 Apr 2010 16:29:50 -0700 Subject: Makefile: Fix final linking of notmuch binary for OS X. Apparently the OS X linker can't resolve symbols when linking a program (notmuch) against a library (libnotmuch) when the library depends on another library (libgmime) that the program doesn't depend on directly. For this case, we need to link the program directly against both libraries, but we don't want to do this on Linux, where the linker can do this on its own and the explicit, unneeded link would cause problems. --- Makefile.local | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile.local') diff --git a/Makefile.local b/Makefile.local index 79ac50d4..4a8142f0 100644 --- a/Makefile.local +++ b/Makefile.local @@ -23,6 +23,9 @@ GPG_FILE=$(SHA1_FILE).asc 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 +ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1) +FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS) +endif FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) .PHONY: all -- cgit v1.2.3