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

these functions must be defined early

... because their result is assigned to variables in various gbuild
classes.

Change-Id: I07c0fc54e10ddd76a6246ac4e9ed56541c9c1257
üst dd4173e9
...@@ -169,29 +169,4 @@ $(call gb_Executable_get_runtime_target,$(1)) : $(2) ...@@ -169,29 +169,4 @@ $(call gb_Executable_get_runtime_target,$(1)) : $(2)
endef endef
# Get dependencies needed for running the executable
#
# This is not strictly necessary, but it makes the use more similar to
# ExternalExecutable.
#
# gb_Executable_get_runtime_dependencies executable
define gb_Executable_get_runtime_dependencies
$(call gb_Executable_get_runtime_target,$(1))
endef
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.
#
# gb_Executable_get_command executable
define gb_Executable_get_command
$(strip $(call gb_Executable__get_command,$(1)))
endef
# vim: set noet sw=4: # vim: set noet sw=4:
...@@ -343,6 +343,31 @@ define gb_StaticLibrary_get_filename ...@@ -343,6 +343,31 @@ define gb_StaticLibrary_get_filename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) $(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
endef endef
# Get dependencies needed for running the executable
#
# This is not strictly necessary, but it makes the use more similar to
# ExternalExecutable.
#
# gb_Executable_get_runtime_dependencies executable
define gb_Executable_get_runtime_dependencies
$(call gb_Executable_get_runtime_target,$(1))
endef
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.
#
# gb_Executable_get_command executable
define gb_Executable_get_command
$(strip $(call gb_Executable__get_command,$(1)))
endef
gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT) gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1)) gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
......
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