summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:18 -0700
commit821b315ebebd5371abd9124478261064b36a6592 (patch)
tree7f6a3c1d5e71c17308ad461727c492964f35923d
parentMerge branch 'gb/am-hg-patch' (diff)
parentMakefile: Improve compiler header dependency check (diff)
downloadtgif-821b315ebebd5371abd9124478261064b36a6592.tar.xz
Merge branch 'da/make-auto-header-dependencies'
* da/make-auto-header-dependencies: Makefile: Improve compiler header dependency check
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 15fb8c23a3..d736b5e196 100644
--- a/Makefile
+++ b/Makefile
@@ -1240,9 +1240,9 @@ COMPUTE_HEADER_DEPENDENCIES =
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; \
- echo $$?')
+dep_check = $(shell $(CC) $(ALL_CFLAGS) \
+ -c -MF /dev/null -MMD -MP -x c /dev/null -o /dev/null 2>&1; \
+ echo $$?)
ifeq ($(dep_check),0)
COMPUTE_HEADER_DEPENDENCIES=YesPlease
endif