1 Return-Path: <bremner@tesseract.cs.unb.ca>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id DB6EA431FC9
\r
6 for <notmuch@notmuchmail.org>; Sat, 25 May 2013 18:28:55 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 6gZIibI5i04I for <notmuch@notmuchmail.org>;
\r
16 Sat, 25 May 2013 18:28:51 -0700 (PDT)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id A1060431FD4
\r
21 for <notmuch@notmuchmail.org>; Sat, 25 May 2013 18:28:40 -0700 (PDT)
\r
22 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
23 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id r4Q1SXH7019220;
\r
24 Sat, 25 May 2013 22:28:33 -0300
\r
25 Received: from remotemail by tesseract.cs.unb.ca with local (Exim 4.80)
\r
26 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
27 id 1UgPlB-0004wH-JC; Sat, 25 May 2013 22:28:33 -0300
\r
28 Received: (nullmailer pid 17209 invoked by uid 1000);
\r
29 Sun, 26 May 2013 01:28:16 -0000
\r
30 From: david@tethera.net
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH 3/3] build: pass CPPFLAGS to C and C++ compilers
\r
33 Date: Sat, 25 May 2013 22:28:13 -0300
\r
34 Message-Id: <1369531693-16918-4-git-send-email-david@tethera.net>
\r
35 X-Mailer: git-send-email 1.7.10.4
\r
36 In-Reply-To: <1369531693-16918-1-git-send-email-david@tethera.net>
\r
37 References: <1369531693-16918-1-git-send-email-david@tethera.net>
\r
38 Cc: David Bremner <bremner@debian.org>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Sun, 26 May 2013 01:28:56 -0000
\r
53 From: David Bremner <bremner@debian.org>
\r
55 This is used in particular by hardening flags.
\r
57 Makefile.local | 8 ++++----
\r
58 1 file changed, 4 insertions(+), 4 deletions(-)
\r
60 diff --git a/Makefile.local b/Makefile.local
\r
61 index c274f07..644623f 100644
\r
62 --- a/Makefile.local
\r
63 +++ b/Makefile.local
\r
64 @@ -39,8 +39,8 @@ GPG_FILE=$(SHA1_FILE).asc
\r
65 PV_FILE=bindings/python/notmuch/version.py
\r
67 # Smash together user's values with our extra values
\r
68 -FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
\r
69 -FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
\r
70 +FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
\r
71 +FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
\r
72 FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
\r
73 FINAL_NOTMUCH_LINKER = CC
\r
74 ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
\r
75 @@ -237,11 +237,11 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
\r
77 %.o: %.cc $(global_deps)
\r
78 @mkdir -p .deps/$(@D)
\r
79 - $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
\r
80 + $(call quiet,CXX $(CPPFLAGS) $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
\r
82 %.o: %.c $(global_deps)
\r
83 @mkdir -p .deps/$(@D)
\r
84 - $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
\r
85 + $(call quiet,CC $(CPPFLAGS) $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
\r