diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-09-22 19:59:37 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 00:54:43 +0300 |
commit | 4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (patch) | |
tree | eac7091c6fa969ed652f8ae23d775b13a30b2b66 /solenv/gbuild/Executable.mk | |
parent | b5fa3764c74047cbee4b825195a8f3b94ba15ffd (diff) |
Try to fix cross-compilation
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
Diffstat (limited to 'solenv/gbuild/Executable.mk')
-rw-r--r-- | solenv/gbuild/Executable.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index ef632dd33cc6..2fd5c1d7444a 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -23,11 +23,17 @@ # gb_Executable_Executable_platform gb_Executable_LAYER_DIRS := \ - UREBIN:$(gb_INSTROOT)/$(LIBO_URE_BIN_FOLDER) \ - OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \ + UREBIN:$(INSTROOT)/$(LIBO_URE_BIN_FOLDER) \ + OOO:$(INSTROOT)/$(LIBO_BIN_FOLDER) \ SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \ NONE:$(gb_Executable_BINDIR) \ +gb_Executable_LAYER_DIRS_FOR_BUILD := \ + UREBIN:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_BIN_FOLDER_FOR_BUILD) \ + OOO:$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER_FOR_BUILD) \ + SDKBIN:$(INSTDIR_FOR_BUILD)/$(gb_Package_SDKDIRNAME)/bin \ + NONE:$(gb_Executable_BINDIR_FOR_BUILD) \ + $(dir $(call gb_Executable_get_runtime_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) @@ -45,8 +51,11 @@ $(call gb_Executable_get_clean_target,%) : $(AUXTARGETS)) gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS))) +gb_Executable__get_dir_for_layer_for_build = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS_FOR_BUILD))) gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1))) +gb_Executable__get_dir_for_exe_for_build = $(call gb_Executable__get_dir_for_layer_for_build,$(call gb_Executable_get_layer,$(1))) gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1)) +gb_Executable_get_install_target_for_build = $(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1)) define gb_Executable_Executable $(call gb_Postprocess_register_target,AllExecutables,Executable,$(1)) |