From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Fredrik Kuivinen <frekui@gmail.com>,
git@vger.kernel.org
Subject: [PATCH] Makefile: Improve compiler header dependency check
Date: Sat, 27 Aug 2011 01:41:10 -0700 [thread overview]
Message-ID: <1314434470-7988-1-git-send-email-davvid@gmail.com> (raw)
The Makefile enables CHECK_HEADER_DEPENDENCIES when the
compiler supports generating header dependencies.
Make the check use the same flags as the invocation
to avoid a false positive when user-configured compiler
flags contain incompatible options.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
I fired up git's next branch on a mac laptop where I
have a config.mak that builds universal git binaries:
CFLAGS = -arch i386 -arch x86_64
This configuration broke when 111ee18c31f9bac9436426399355facc79238566
was merged into next. gcc cannot generate header dependencies when
multiple -arch statements are used but the test generated a false
positive.
Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index aa67142..30f3812 100644
--- a/Makefile
+++ b/Makefile
@@ -1251,7 +1251,8 @@ USE_COMPUTED_HEADER_DEPENDENCIES =
else
ifndef COMPUTE_HEADER_DEPENDENCIES
dep_check = $(shell sh -c \
- '$(CC) -c -MF /dev/null -MMD -MP -x c /dev/null -o /dev/null 2>&1; \
+ '$(CC) -c -MF /dev/null -MMD -MP -x c /dev/null -o /dev/null \
+ $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) 2>&1; \
echo $$?')
ifeq ($(dep_check),0)
COMPUTE_HEADER_DEPENDENCIES=YesPlease
--
1.7.6.476.g57292
next reply other threads:[~2011-08-27 8:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-27 8:41 David Aguilar [this message]
2011-08-27 16:26 ` [PATCH] Makefile: Improve compiler header dependency check Jonathan Nieder
2011-08-27 21:00 ` [PATCH v2] " David Aguilar
2011-08-28 11:47 ` Fredrik Kuivinen
2011-08-30 4:05 ` Jonathan Nieder
2011-08-30 8:27 ` [PATCH v3] " David Aguilar
2011-08-30 8:33 ` Jonathan Nieder
2011-08-30 17:17 ` Junio C Hamano
2011-08-27 21:19 ` [PATCH] " David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314434470-7988-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=frekui@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).