Kaydet (Commit) 3638ffa2 authored tarafından David Tardon's avatar David Tardon

always set library path

Change-Id: Id8984f64615ac5d2ecfccca5d1d44ea5db76811c
üst c97a46ad
......@@ -48,7 +48,7 @@
# SrsPartMergeTarget class
gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3)
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,transex3)
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(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 $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc)
gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc)
define gb_SrsPartTarget__command
$(call gb_Helper_abbreviate_dirs,\
......
......@@ -206,7 +206,7 @@ $(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def)))
endef
define gb_Helper_execute
$(gb_Helper_set_ld_path) $(call gb_Executable_get_command,$(firstword $(1))) $(wordlist 2,$(words $(1)),$(1))
$(call gb_Executable_get_command,$(firstword $(1))) $(wordlist 2,$(words $(1)),$(1))
endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
......
......@@ -156,7 +156,7 @@ endef
# gb_ScpConvertTarget_ScpConvertTarget_platform
gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv)
gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,ulfconv)
gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv)
define gb_ScpConvertTarget__command
$(call gb_Output_announce,$(2),$(true),SCC,1)
......
......@@ -32,7 +32,7 @@
# SdiTarget class
gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
gb_SdiTarget_SVIDLCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,svidl)
gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)
$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
$(call gb_Output_announce,$*,$(true),SDI,1)
......
......@@ -358,19 +358,13 @@ $(call gb_Executable_get_runtime_target,$(1))
endef
endif
define gb_Executable__get_command
$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!))
$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \
$(call gb_Executable_get_target_for_build,$(1))
endef
# Get complete command-line for running the executable
#
# This includes setting library path, if necessary.
# This includes setting library path.
#
# gb_Executable_get_command executable
define gb_Executable_get_command
$(strip $(call gb_Executable__get_command,$(1)))
$(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,$(1))
endef
gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment