From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 4D8456DE11D4 for ; Tue, 22 Aug 2017 15:44:13 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.067 X-Spam-Level: X-Spam-Status: No, score=-0.067 tagged_above=-999 required=5 tests=[AWL=-0.106, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.211, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UWNfsI7GP58f for ; Tue, 22 Aug 2017 15:44:12 -0700 (PDT) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by arlo.cworth.org (Postfix) with ESMTPS id 6BC6D6DE1203 for ; Tue, 22 Aug 2017 15:44:12 -0700 (PDT) Received: by mail-wr0-f194.google.com with SMTP id z91so47316wrc.4 for ; Tue, 22 Aug 2017 15:44:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GF/76/zKkgOJL+RI/T19XEEfLOo/gon/xuVDDz2gQH4=; b=JMynG1VekHuFddJUJfT22+u0KN30GICG+ajS4xqBkiQ+x3+so6xNfj5vfHOP/Idr33 s1Lircu2jRErnQwkbbMOpbFi7yLnBulasbvvzkdEaj3c76q4eUhs4mhxbRjQZ0f5OQC2 Eynne66AQWZEf+d5ouskg5oNdd6hu5LkQ8D39ibVSrvGPFp61u/bh9v0M7JYznEsyhxT RnfmYtVNC/Gr1WD0CerC16fW97PgJbvNHjNrUAUTDH9JEV82pexee+RRoFWKe2XBRJ2R 4u/RrE3up/5d5umg6YMtbPj9NagpmD+DuP2FxXs1jbUveWs6QWGDfbFAgQsIfbvaRgyG aEbA== X-Gm-Message-State: AHYfb5ii+2bvcxYfgCw92J8b+EmdfrKprubbyg7+nZojwU78Rt8YVVuZ BV6R0OGWkqbe9OpTPhg= X-Received: by 10.223.163.18 with SMTP id c18mr286270wrb.164.1503441850852; Tue, 22 Aug 2017 15:44:10 -0700 (PDT) Received: from home.thecybershadow.net ([89.28.117.31]) by smtp.gmail.com with ESMTPSA id e137sm491385wma.29.2017.08.22.15.44.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Aug 2017 15:44:09 -0700 (PDT) From: Vladimir Panteleev To: notmuch@notmuchmail.org Subject: [PATCH 2/8] Split CONFIGURE_LDFLAGS out of FINAL_LIBNOTMUCH_LDFLAGS Date: Tue, 22 Aug 2017 22:43:33 +0000 Message-Id: <20170822224339.22601-3-notmuch@thecybershadow.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170822224339.22601-1-notmuch@thecybershadow.net> References: <20170822224339.22601-1-notmuch@thecybershadow.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Tue, 22 Aug 2017 22:44:13 -0000 Previously, FINAL_LIBNOTMUCH_LDFLAGS contained two different kinds of flags: - Linker configuration flags (LDFLAGS and AS_NEEDED_FLAGS) - List of items to link (CONFIGURE_LDFLAGS) As it can be necessary to prepend to the list of items to link, while still allow them to be affected by the position-dependent linker configuration flags, split CONFIGURE_LDFLAGS out of FINAL_LIBNOTMUCH_LDFLAGS and mention it explicitly when necessary. --- Makefile.global | 2 +- Makefile.local | 2 +- lib/Makefile.local | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.global b/Makefile.global index cae4c7d1..5d10bff7 100644 --- a/Makefile.global +++ b/Makefile.global @@ -62,4 +62,4 @@ ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1) FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS) FINAL_NOTMUCH_LINKER = CXX endif -FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS) +FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) diff --git a/Makefile.local b/Makefile.local index af12ca7f..9b0f7d30 100644 --- a/Makefile.local +++ b/Makefile.local @@ -246,7 +246,7 @@ notmuch_client_modules = $(notmuch_client_srcs:.c=.o) notmuch.o: version.stamp notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libnotmuch_util.a parse-time-string/libparse-time-string.a - $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@ + $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) $(CONFIGURE_LDFLAGS) -o $@ notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME) $(call quiet,$(FINAL_NOTMUCH_LINKER) $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@ diff --git a/lib/Makefile.local b/lib/Makefile.local index 0b5c4b08..fbcdbda8 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -65,7 +65,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) $(call quiet,AR) rcs $@ $^ $(dir)/$(LIBNAME): $(libnotmuch_modules) util/libnotmuch_util.a parse-time-string/libparse-time-string.a - $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a + $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(CONFIGURE_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a $(dir)/$(SONAME): $(dir)/$(LIBNAME) ln -sf $(LIBNAME) $@ -- 2.13.3