aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorGravatar Tom Prince <tom.prince@ualberta.net>2011-11-13 12:05:03 -0500
committerGravatar David Bremner <bremner@debian.org>2011-11-13 14:58:21 -0400
commit74f16571e8d9514d0bdc6eef0990da5f161020e4 (patch)
tree0e9386c2f94ae6b649c9ae4d7c281f16b88bdd11 /lib
parentcb7270b27a4cef99fc4a3f5d44c461da5d622605 (diff)
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.local2
1 files changed, 1 insertions, 1 deletions
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) > $@