diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-16 19:55:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-16 23:58:44 +0200 |
| commit | 236055746ffe92ce3b2a7a9316b1083da046deb9 (patch) | |
| tree | 03413d6b3b2f553ec67cbaeb5a8c4854b599fb53 /solenv/gbuild/WinResTarget.mk | |
| parent | fix LinkTarget dep-target dependencies: (diff) | |
| download | core-236055746ffe92ce3b2a7a9316b1083da046deb9.tar.gz core-236055746ffe92ce3b2a7a9316b1083da046deb9.zip | |
further spurious dep-file rebuild fixes:
With the way dep-file generation was changed for LinkTargets in
8b5a984d45005d3df1c89eae897d6e04612625d8, it is necessary to change all
other dep-file generation the same way, because the LinkTarget dep-files
are outdated wrt. the object dep-files after an initial make run, and
hence if any other dep-file depends in any way (even build-order) on a
generated Executable, say by depending on the corresponding target file,
then the PHONY entries in the outdated LinkTarget dep-files for the
executable and its linked libraries cause all these objects to be
recompiled.
It is not a problem that there is a rule with the dep-file as target,
and another rule for the corresponding actual target that writes the
dep-file as a side-effect, without dependecy between the targets:
because make does processing in 2 phases, first building all included
makefiles, second all other targets, it is guaranteed that the 2
commands don't race to overwrite the dep-file because (when there is no
dependency between them) they will not be executed in the same phase.
The only problem here is that this will probably make IDL processing a
lot slower on Windows, writing all those dummy dep-files.
Diffstat (limited to 'solenv/gbuild/WinResTarget.mk')
| -rw-r--r-- | solenv/gbuild/WinResTarget.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index 563a74f5bb77..b3c5b68126bc 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -16,12 +16,7 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_target,$(1)) : RCFILE := ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_WinResTarget_get_target,$(1)) : $(call gb_WinResTarget_get_dep_target,$(1)) -ifneq ($(wildcard $(call gb_WinResTarget_get_dep_target,$(1))),) -include $(call gb_WinResTarget_get_dep_target,$(1)) -else -$(firstword $(MAKEFILE_LIST)) : $(call gb_WinResTarget_get_dep_target,$(1)) -endif +-include $(call gb_WinResTarget_get_dep_target,$(1)) $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS) $(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) $(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE := |