From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mGtUAokRxmFEXQAAgWs5BA (envelope-from ) for ; Fri, 24 Dec 2021 19:29:29 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wC6ROYgRxmF4dQAAB5/wlQ (envelope-from ) for ; Fri, 24 Dec 2021 18:29:28 +0000 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C24BD14585 for ; Fri, 24 Dec 2021 19:29:28 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 0929F5F724; Fri, 24 Dec 2021 18:29:18 +0000 (UTC) X-Greylist: delayed 146661 seconds by postgrey-1.36 at yantan; Fri, 24 Dec 2021 18:29:15 UTC Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 47ACF5F71D for ; Fri, 24 Dec 2021 18:29:15 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 7F7365FC42; Fri, 24 Dec 2021 13:29:14 -0500 (EST) Received: (nullmailer pid 2353765 invoked by uid 1000); Fri, 24 Dec 2021 18:29:11 -0000 From: David Bremner To: Tomi Ollila , David Bremner , Ryan Schmidt , notmuch@notmuchmail.org Subject: [PATCH 3/3] build: move {C,CXX}FLAGS to the end of FINAL_{C,CXX}FLAGS Date: Fri, 24 Dec 2021 14:29:05 -0400 Message-Id: <20211224182905.2353744-3-david@tethera.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211224182905.2353744-1-david@tethera.net> References: <20211224182905.2353744-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: HQF7COUVEPLIRVVQC7L6LVNKWOMZOQUM X-Message-ID-Hash: HQF7COUVEPLIRVVQC7L6LVNKWOMZOQUM X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640370568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=c4eJ06wizl1GVuzVqS4h+jT58VuSD9biN3pQVAK+lS4=; b=S+b13fmYUCwXKtrhQzbVspRrmMyf/wSpLAr1/eWSI7OOjeVFMMY8BwYhhkjzhGnLxWVsX7 I/v+RKuhAAqgx+qlbYRDZk1EU1Ulosw3qiRvoAk2AV04Wpk2VjgYRpO8fCRq0g9ZcTmurc /O9UhqaLY2j72KHwtDtILsvDZPXsefj3RAf8B5A9PUAHdHuBNDyAOWQ0CZ075Bx3JYgxIs vHelymNk++PTwJEKB8N3x4hNVrgUkVP6czVRx/KGBQw706z0/FEQQ0ssqbE8LHZhj7P9Ix m/VVLUN46vORsvr7oLsXGUiBONjJ6lo27Q5bVCyad/F1Pql8Whqz5R42u40O/g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640370568; a=rsa-sha256; cv=none; b=QbCxpjifdhqJ/Oq17ABRMpqPtaSRwAjoujJn5EvpoaDZ5d0bBGnYFZ0KRf+nrHrWkg0HEr WNoSpotZ0e5HR34qvixDrdNLvvyIqH4r3fElcozy/HcPZFTvlpsVMS3szUqjUdKvkYeRp1 fHmgaTxzEwnUtDYlrm8nnNH+hEIaJ97MVI+WdD5x+8NiaKjYGRBpUQd7q2As8AzCJ8sAAf 8KNiQ/KDRTdhfrv36/J4WhhtL6WZ5ZAgPQMVnu+qIZSLL4ps2ErgvarEv1zPJQfcwBb2Mb R6/rdP0yGSjyl3gT1efx+50QAKP3IJM59j1WVomx+UI6Om1TMf4CmmP1cGsn6g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.75 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: C24BD14585 X-Spam-Score: -1.75 X-Migadu-Scanner: scn0.migadu.com X-TUID: scERFJ3JxSlv In addition to avoiding problems with user specified include paths picking up an installed version of notmuch.h, this should also enable users to override more options (in particular they could override warning options since the last one takes effect). [1]: id:7851CAB5-4556-4931-A0A2-37003E56C927@ryandesign.com --- Makefile.global | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.global b/Makefile.global index b712dd7b..7a7a3c6d 100644 --- a/Makefile.global +++ b/Makefile.global @@ -50,8 +50,8 @@ DETACHED_SIG_FILE=$(TAR_FILE).asc PV_FILE=bindings/python/notmuch/version.py # Smash together user's values with our extra values -FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CPPFLAGS) $(CONFIGURE_CFLAGS) -FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CPPFLAGS) $(CONFIGURE_CXXFLAGS) +FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(WARN_CFLAGS) $(extra_cflags) $(CPPFLAGS) $(CONFIGURE_CFLAGS) $(CFLAGS) +FINAL_CXXFLAGS = $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CPPFLAGS) $(CONFIGURE_CXXFLAGS) $(CXXFLAGS) FINAL_NOTMUCH_LDFLAGS = -Lutil -lnotmuch_util -Llib -lnotmuch $(LDFLAGS) ifeq ($(LIBDIR_IN_LDCONFIG),0) FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) -- 2.34.1