diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-16 13:51:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-16 23:58:44 +0200 |
| commit | 6cdc3b9ceb13954f82026d851ab4ca88a706cb84 (patch) | |
| tree | c9ba940626c536a27aec2f3efc35c8d60b39eb19 | |
| parent | 07c0b800d9d70857882238204820f75b8dc98b26 (diff) | |
fix LinkTarget dep-target dependencies:
The LinkTarget dep-target depends on the LinkTarget headers target,
which appears unnecessary and harmful because since commit
8b5a984d45005d3df1c89eae897d6e04612625d8 the initial dep files always
contain PHONY deps anyway; also the PHONY deps cause spurious re-builds
here because e.g. the tools library depends on a tools package that
depends on a tools custom target that depends on some executable
that depends on libuno_sal that depends on its objects which depend on
this PHONY thing so all that stuff is spuriously re-compiled in make
subsequentcheck after a build from scratch, breaking tests because
being subsequent they don't expect libraries to change under them.
Also, link target shouldn't depend on its dep target.
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 4e78ce5ae351..05b947ebecf6 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -102,7 +102,7 @@ endef # In the dep file rule just touch it so it's newer than the object. # The gb_Object__command_dep generates an "always rebuild" dep file; -# It is _only_ used in case the user deletes the object dep file. +# It is used on first build and in case the user deletes the object dep file. ifeq ($(gb_FULLDEPS),$(true)) define gb_Object__command_dep mkdir -p $(dir $(1)) && \ @@ -374,8 +374,8 @@ $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(call gb_LinkTarget__command_objectlist,$@,$*) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_dep_target,%) -$(call gb_LinkTarget_get_dep_target,%) : | $(call gb_LinkTarget_get_headers_target,%) +$(call gb_LinkTarget_get_target,%) : | $(call gb_LinkTarget_get_dep_target,%) +$(call gb_LinkTarget_get_dep_target,%) : $(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCOBJECTS),$(OBJCXXOBJECTS),$(ASMOBJECTS),$(GENCOBJECTS),$(GENCXXOBJECTS)) endif |