Code

Merge branch 'da/make-auto-header-dependencies'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:18 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:18 +0000 (12:36 -0700)
* da/make-auto-header-dependencies:
  Makefile: Improve compiler header dependency check

Makefile

index 15fb8c23a34e7cd0242d691bd9427eb443d516d7..d736b5e196e7739cabd5b79aafa5cabf92d203ae 100644 (file)
--- 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