From 74f16571e8d9514d0bdc6eef0990da5f161020e4 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Sun, 13 Nov 2011 12:05:03 -0500 Subject: [PATCH] Link libutil using filenmae, rather than using -l. glibc includes a libutil, so if the wrong -L options get passed, we will pick up glibc's version, rather than our own. --- lib/Makefile.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile.local b/lib/Makefile.local index d58552c4..57dca702 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -70,7 +70,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) $(call quiet,AR) rcs $@ $^ $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym - $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ -L$(srcdir)/util -lutil + $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules) sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@ -- 2.43.0