aboutsummaryrefslogtreecommitdiff
path: root/Makefile.global
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2021-12-24 14:29:03 -0400
committerDavid Bremner <david@tethera.net>2021-12-31 07:07:32 -0400
commit2494e61b9ee6bbab4ac017136d7c6ee0de19b26d (patch)
tree4115e79fe13a23cc84e5c3dff9fc3a1cee16bf92 /Makefile.global
parent6721e2eac5c8698cc7f364c58c646f6b44105b57 (diff)
build: move LDFLAGS after notmuch libraries.
In [1] Ryan Schmidt reported a problem on macports [2] with notmuch finding an existing installed version of libnotmuch during the build when the user specified LDFLAGS including the libnotmuch install directory. This change should prevent that. LDFLAGS also occurs in FINAL_LIBNOTMUCH_LDFLAGS. The only built library linked to that is util/libtnotmuch_util.a, and that passed as explicit (relative) path, and is thus not affected by -L. [1]: id:7851CAB5-4556-4931-A0A2-37003E56C927@ryandesign.com [2]: The problem does not arise when libnotmuch is installed into a "system" library path that the compiler/linker searches by default.
Diffstat (limited to 'Makefile.global')
-rw-r--r--Makefile.global2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.global b/Makefile.global
index fe79121d..e6b00815 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -52,7 +52,7 @@ PV_FILE=bindings/python/notmuch/version.py
# Smash together user's values with our extra values
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lnotmuch_util -Llib -lnotmuch
+FINAL_NOTMUCH_LDFLAGS = -Lutil -lnotmuch_util -Llib -lnotmuch $(LDFLAGS)
ifeq ($(LIBDIR_IN_LDCONFIG),0)
FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
endif