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/platform/IOS_ARM_GCC.mk | |
| parent | Updated core (diff) | |
| download | core-0618b35ebda29b911058254cd34620e8b24ab8f7.tar.gz core-0618b35ebda29b911058254cd34620e8b24ab8f7.zip | |
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/platform/IOS_ARM_GCC.mk')
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 8d4f7ebd3835..a5f241f2925f 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -196,10 +196,10 @@ gb_Executable_EXT := gb_Executable_TARGETTYPEFLAGS := gb_Executable_LAYER := \ - $(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \ + $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ + $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \ + $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ define gb_Executable_Executable_platform @@ -257,9 +257,6 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif -# Package class -gb_Package_SDKDIRNAME := sdk - # UIMenubarTarget class define gb_UIMenubarTarget__command |