diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-07 23:13:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 23:13:34 (GMT) |
| commit | 45bb6cbb49699a64196ed866c4809cd8267bd481 (patch) | |
| tree | a276aa57155d294793b0ed712c7708266109593c /Makefile | |
| parent | 42f50f8d0150605ab4da32d283cef2df0bcb51ab (diff) | |
| parent | 69789347134b4b04411ae22f6eb516552b6ac365 (diff) | |
| download | git-45bb6cbb49699a64196ed866c4809cd8267bd481.zip git-45bb6cbb49699a64196ed866c4809cd8267bd481.tar.gz git-45bb6cbb49699a64196ed866c4809cd8267bd481.tar.bz2 | |
Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint
Buggy versions of ccache broke the auto-generation of dependencies.
* jn/auto-depend-workaround-buggy-ccache:
Makefile: explicitly set target name for autogenerated dependencies
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1475,7 +1475,8 @@ endif ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto) dep_check = $(shell $(CC) $(ALL_CFLAGS) \ - -c -MF /dev/null -MMD -MP -x c /dev/null -o /dev/null 2>&1; \ + -c -MF /dev/null -MQ /dev/null -MMD -MP \ + -x c /dev/null -o /dev/null 2>&1; \ echo $$?) ifeq ($(dep_check),0) override COMPUTE_HEADER_DEPENDENCIES = yes @@ -2329,7 +2330,7 @@ $(dep_dirs): missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs)) dep_file = $(dir $@).depend/$(notdir $@).d -dep_args = -MF $(dep_file) -MMD -MP +dep_args = -MF $(dep_file) -MQ $@ -MMD -MP ifdef CHECK_HEADER_DEPENDENCIES $(error cannot compute header dependencies outside a normal build. \ Please unset CHECK_HEADER_DEPENDENCIES and try again) |