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 /odk/Package_lib.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 'odk/Package_lib.mk')
-rw-r--r-- | odk/Package_lib.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk index c9758f8ca44a..05465c03812f 100644 --- a/odk/Package_lib.mk +++ b/odk/Package_lib.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_lib,$(WORKDIR)/LinkTarget/StaticLibrary)) $(eval $(call gb_Package_set_outdir,odk_lib,$(INSTDIR))) -$(eval $(call gb_Package_add_files,odk_lib,$(gb_Package_SDKDIRNAME)/lib,\ +$(eval $(call gb_Package_add_files,odk_lib,$(SDKDIRNAME)/lib,\ $(if $(filter LINUX,$(OS)),$(notdir $(call gb_StaticLibrary_get_target,salcpprt))) \ )) |