diff options
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/PrecompiledHeaders.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 208b66a84f0f..5abd3c2ba3cf 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -537,7 +537,7 @@ gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS) .PHONY : $(WORKDIR)/Clean/LinkTarget/% $(WORKDIR)/Clean/LinkTarget/% : - $(call gb_Output_announce,$*,$(false),LNK,4) + $(call gb_Output_announce,$(LINKTARGETMAKEFILENAME),$(false),LNK,4) RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \ @@ -570,6 +570,7 @@ $(WORKDIR)/Clean/LinkTarget/% : $(call gb_LinkTarget_get_dep_target,$(LINKTARGET)) \ $(call gb_LinkTarget_get_headers_target,$(LINKTARGET)) \ $(call gb_LinkTarget_get_objects_list,$(LINKTARGET)) \ + $(call gb_LinkTarget_get_pch_timestamp,$(LINKTARGETMAKEFILENAME)) \ $(ILIBTARGET) \ $(AUXTARGETS)) && \ cat $${RESPONSEFILE} /dev/null | $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") xargs -n 200 rm -fr && \ @@ -724,6 +725,7 @@ $(WORKDIR)/Headers/% : # call gb_LinkTarget_LinkTarget,linktarget,linktargetmakefilename,layer define gb_LinkTarget_LinkTarget $(call gb_LinkTarget_get_clean_target,$(1)) : LINKTARGET := $(1) +$(call gb_LinkTarget_get_clean_target,$(1)) : LINKTARGETMAKEFILENAME := $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := $(call gb_LinkTarget_get_headers_target,$(1)) : SELF := $(call gb_LinkTarget__get_workdir_linktargetname,$(1)) $(call gb_LinkTarget_get_headers_target,$(1)) : \ @@ -1124,7 +1126,7 @@ $(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(call gb_CxxObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) ifneq ($(gb_ENABLE_PCH),) -$(call gb_CxxObject_get_target,$(2)) : $(call gb_PrecompiledHeader_get_timestamp,$(4)) +$(call gb_CxxObject_get_target,$(2)) : $(call gb_LinkTarget_get_pch_timestamp,$(4)) endif ifeq ($(gb_FULLDEPS),$(true)) @@ -1261,7 +1263,7 @@ $(call gb_GenCxxObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) $(call gb_GenCxxObject_get_target,$(2)) : GEN_CXX_SOURCE := $(call gb_GenCxxObject_get_source,$(2),$(1)) ifneq ($(gb_ENABLE_PCH),) -$(call gb_GenCxxObject_get_target,$(2)) : $(call gb_PrecompiledHeader_get_timestamp,$(4)) +$(call gb_GenCxxObject_get_target,$(2)) : $(call gb_LinkTarget_get_pch_timestamp,$(4)) endif ifeq ($(gb_FULLDEPS),$(true)) @@ -1523,7 +1525,7 @@ $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += -DPCH_LEVEL=$(gb_ENABLE_PCH) $(call gb_PrecompiledHeader_get_target,$(3),$(4)) : VISIBILITY := -$(call gb_PrecompiledHeader_get_timestamp,$(4)) : $(call gb_PrecompiledHeader_get_target,$(3),$(4)) +$(call gb_LinkTarget_get_pch_timestamp,$(4)) : $(call gb_PrecompiledHeader_get_target,$(3),$(4)) ifeq ($(gb_FULLDEPS),$(true)) -include $(call gb_PrecompiledHeader_get_dep_target,$(3),$(4)) diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk index 9bf64e2e4cbb..6654cf7259a2 100644 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ b/solenv/gbuild/PrecompiledHeaders.mk @@ -59,7 +59,6 @@ $(call gb_PrecompiledHeader_get_clean_target,$(1)) : $$(call gb_PrecompiledHeader_get_target,$(1),$(2)).obj \ $$(call gb_PrecompiledHeader_get_target,$(1),$(2)).pdb \ $$(call gb_PrecompiledHeader_get_target,$(1),$(2)).sum \ - $$(call gb_PrecompiledHeader_get_timestamp,$(2)) \ $$(call gb_PrecompiledHeader_get_dep_target,$(1),$(2))) endef @@ -68,7 +67,7 @@ endif # $(call gb_PrecompiledHeader_generate_timestamp_rule,linktargetmakefilename) define gb_PrecompiledHeader_generate_timestamp_rule -$(call gb_PrecompiledHeader_get_timestamp,$(1)) : +$(call gb_LinkTarget_get_pch_timestamp,$(1)) : mkdir -p $$(dir $$@) && touch $$@ endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 27bc9ae189e2..14f738f7ee6f 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -121,6 +121,7 @@ gb_LinkTarget_get_dep_target = \ gb_LinkTarget_get_clean_target = \ $(WORKDIR)/Clean/LinkTarget/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)) gb_LinkTarget_get_target = $(lastword $(subst <>, ,$(1))) +gb_LinkTarget_get_pch_timestamp = $(WORKDIR)/PrecompiledHeader/$(call gb_PrecompiledHeader__get_debugdir,$(1))/Timestamps/$(1) gb_Module_get_nonl10n_target = $(WORKDIR)/Module/nonl10n/$(1) gb_Module_get_l10n_target = $(WORKDIR)/Module/l10n/$(1) gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1) @@ -149,7 +150,6 @@ gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1) gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(call gb_PrecompiledHeader__get_debugdir,$(2))/$(1).hxx$(gb_PrecompiledHeader_EXT).d gb_PrecompiledHeader_get_dep_target_tmp = $(call gb_PrecompiledHeader_get_dep_target,$(1),$(2)).tmp gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(call gb_PrecompiledHeader__get_debugdir,$(2))/$(1).hxx$(gb_PrecompiledHeader_EXT) -gb_PrecompiledHeader_get_timestamp = $(WORKDIR)/PrecompiledHeader/$(call gb_PrecompiledHeader__get_debugdir,$(1))/Timestamps/$(1) gb_PropertiesTranslateTarget_get_target = $(WORKDIR)/PropertiesTranslateTarget/$(1).properties gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done |