diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-12-31 12:54:14 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-12-31 13:01:53 +0200 |
commit | 877113907606df20d465eee9b698c86d2299de18 (patch) | |
tree | b1b411b18808d6e0afadba2a3624e8f30695e723 | |
parent | fe20c74c3ff788e63174b4436357adaf3c965a52 (diff) |
Add b_Helper_set_ld_path back in more places
Change-Id: I05d1fc218fad0987958600a2638953672281919e
-rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/SdiTarget.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 9e348e732980..c85b612a40d0 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -48,7 +48,7 @@ # SrsPartMergeTarget class gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3) -gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(call gb_Executable_get_command,transex3) +gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,transex3) define gb_SrsPartMergeTarget__command $(call gb_Output_announce,$(3),$(true),srs,1) @@ -87,7 +87,7 @@ endef # gb_SrsPartTarget__command_dep gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc) -gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc) +gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc) define gb_SrsPartTarget__command $(call gb_Helper_abbreviate_dirs,\ diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index fca80c1481a0..4584e195b058 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -156,7 +156,7 @@ endef # gb_ScpConvertTarget_ScpConvertTarget_platform gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv) -gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv) +gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,ulfconv) define gb_ScpConvertTarget__command $(call gb_Output_announce,$(2),$(true),SCC,1) diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 6ecc79d133c9..0ccfc56e08eb 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -32,7 +32,7 @@ # SdiTarget class gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl) -gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl) +gb_SdiTarget_SVIDLCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,svidl) $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS) $(call gb_Output_announce,$*,$(true),SDI,1) |