Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 0CC8B429E21 for ; Sun, 13 Nov 2011 09:05:12 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pDG0QwJNSUDV for ; Sun, 13 Nov 2011 09:05:11 -0800 (PST) Received: from socrates.hocat.ca (socrates.hocat.ca [76.10.188.53]) by olra.theworths.org (Postfix) with ESMTP id 7CAA2431FB6 for ; Sun, 13 Nov 2011 09:05:11 -0800 (PST) Received: from hermes.hocat.ca (hermes.hocat.ca [69.165.170.253]) by socrates.hocat.ca (Postfix) with SMTP id 683D21801; Sun, 13 Nov 2011 10:05:07 -0700 (MST) Received: (nullmailer pid 4237 invoked by uid 1000); Sun, 13 Nov 2011 17:05:05 -0000 From: Tom Prince To: Notmuch Mail Subject: [PATCH] Link libutil using filenmae, rather than using -l. Date: Sun, 13 Nov 2011 12:05:03 -0500 Message-Id: <1321203903-4201-1-git-send-email-tom.prince@ualberta.net> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <87bosgasm5.fsf@hermes.hocat.ca> References: <87bosgasm5.fsf@hermes.hocat.ca> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Nov 2011 17:05:12 -0000 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 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Makefile.local b/lib/Makefile.local index cb53781..54c4dea 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) > $@ -- 1.7.6.1