diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-25 16:28:01 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-25 16:29:00 +0200 |
| commit | 6ed5e4fe91ecb3bdac7eb2bf070139cfb12867c4 (patch) | |
| tree | 7bc75237205894805e02d4bde589e3a9c140e25d | |
| parent | 52807a0daac358ca2472b851070653cdcf3a246f (diff) | |
add missing dep on cpp.lcc
Change-Id: I3e86ce3ebafd2347164e484d060086beae05430b
| -rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 34c32a97ad15..53e97e952c02 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -74,24 +74,27 @@ endef # ScpPreprocessTarget class +gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp.lcc) +gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET) + gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp define gb_ScpPreprocessTarget__command $(call gb_Output_announce,$(2),$(true),SPP,2) $(call gb_Helper_abbreviate_dirs,\ - $(call gb_Helper_execute,cpp.lcc) \ + $(gb_ScpPreprocessTarget_COMMAND) \ -+ -P \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ - $(3) > $(1) \ + $(SCP_SOURCE) > $(1) \ ) endef $(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(call gb_ScpPreprocessTarget_get_target,%) : - $(call gb_ScpPreprocessTarget__command,$@,$*,$<) +$(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_TARGET) + $(call gb_ScpPreprocessTarget__command,$@,$*) .PHONY : $(call gb_ScpPreprocessTarget_get_clean_target,%) $(call gb_ScpPreprocessTarget_get_clean_target,%) : @@ -100,6 +103,7 @@ $(call gb_ScpPreprocessTarget_get_clean_target,%) : # gb_ScpPreprocessTarget_ScpPreprocessTarget(<target>) define gb_ScpPreprocessTarget_ScpPreprocessTarget +$(call gb_ScpPreprocessTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1)) $(call gb_ScpPreprocessTarget_get_target,$(1)) : $(call gb_ScpPreprocessTarget_get_source,$(1)) $(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(dir $(call gb_ScpPreprocessTarget_get_target,$(1))).dir |