diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-23 15:34:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 15:38:10 +0300 |
| commit | 0618b35ebda29b911058254cd34620e8b24ab8f7 (patch) | |
| tree | 381c2b5531b4745c0cd89b5994022bf98a37c08d /solenv/gbuild/Executable.mk | |
| parent | 3f516cc112599c7e55672a178a62081b70fa91ef (diff) | |
Fixes for cross-compilation on OS X (to iOS)
Introduce SDKDIRNAME as a configury variable and use it instead of the
gbuild gb_Package_SDKDIRNAME. Then we can easily construct the
SDKDIRNAME_FOR_BUILD variant that is needed to find the specially
named SDK in instdir on OS X when cross-compiling.
Move the version number section in configure.ac earlier.
Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701
Diffstat (limited to 'solenv/gbuild/Executable.mk')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 2fd5c1d7444a..328b6398801d 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -25,13 +25,13 @@ gb_Executable_LAYER_DIRS := \ UREBIN:$(INSTROOT)/$(LIBO_URE_BIN_FOLDER) \ OOO:$(INSTROOT)/$(LIBO_BIN_FOLDER) \ - SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \ + SDKBIN:$(INSTDIR)/$(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 \ + SDKBIN:$(INSTDIR_FOR_BUILD)/$(SDKDIRNAME_FOR_BUILD)/bin \ NONE:$(gb_Executable_BINDIR_FOR_BUILD) \ $(dir $(call gb_Executable_get_runtime_target,%)).dir : |