diff options
| author | Memphiz <memphis@machzwo.de> | 2017-09-27 18:00:44 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2017-10-30 00:32:23 +0100 |
| commit | b1471fe7caf63df589c7f888319dd072aa0982b5 (patch) | |
| tree | 862c75f3d607377e3312419a5ffcbc76a76cfe30 /tools | |
| parent | cbff78ae43a5f0f49b7de85073d25d0fa8796c97 (diff) | |
[depends/native] - determine current osx version and use this as deployment target for the native depends (should force that binaries are actually able to run on the compiling host even when using newer sdk versions)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/Makefile.include.in | 8 | ||||
| -rw-r--r-- | tools/depends/configure.ac | 3 | ||||
| -rw-r--r-- | tools/depends/native/config.site.native.in | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index 70b2b2c626..f4daa90670 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -90,10 +90,10 @@ STRIP_FOR_BUILD=@STRIP_FOR_BUILD@ READELF_FOR_BUILD=@READELF_FOR_BUILD@ OBJDUMP_FOR_BUILD=@OBJDUMP_FOR_BUILD@ -NATIVE_CFLAGS=-I@prefix@/@tool_dir@/include -NATIVE_LDFLAGS=-L@prefix@/@tool_dir@/lib -NATIVE_CPPFLAGS=-I@prefix@/@tool_dir@/include -NATIVE_CXXFLAGS=-I@prefix@/@tool_dir@/include +NATIVE_CFLAGS=@native_platform_min_version@ -I@prefix@/@tool_dir@/include +NATIVE_LDFLAGS=@native_platform_min_version@ -L@prefix@/@tool_dir@/lib +NATIVE_CPPFLAGS=@native_platform_min_version@ -I@prefix@/@tool_dir@/include +NATIVE_CXXFLAGS=@native_platform_min_version@ -I@prefix@/@tool_dir@/include ifeq ($(CPU), arm64) diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index a593c555ed..36dbd2e767 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -257,6 +257,8 @@ case $host in if test "x$prefix" = "xNONE"; then prefix=/Users/Shared/xbmc-depends fi + + native_platform_min_version=-mmacosx-version-min=`sw_vers | grep ProductVersion | sed "s/.*:.*\(10\..*\)\..*/\1/"` use_xcodepath=`xcode-select -print-path` use_xcodebuild=$use_xcodepath/usr/bin/xcodebuild use_xcode=[`$use_xcodebuild -version | grep Xcode | awk '{ print $2}'`] @@ -699,6 +701,7 @@ AC_SUBST(enable_wayland) AC_SUBST(has_libcrystax) AC_SUBST(use_xcode) AC_SUBST(use_ccache) +AC_SUBST(native_platform_min_version) AC_OUTPUT echo -e "ccache:\t $use_ccache" diff --git a/tools/depends/native/config.site.native.in b/tools/depends/native/config.site.native.in index 56d9c2bff8..d4922cae58 100644 --- a/tools/depends/native/config.site.native.in +++ b/tools/depends/native/config.site.native.in @@ -9,10 +9,10 @@ STRIP="${STRIP:-@STRIP_FOR_BUILD@}" READELF="${READELF:-@READELF_FOR_BUILD@}" OBJDUMP="${OBJDUMP:-@OBJDUMP_FOR_BUILD@}" -CFLAGS="-I@prefix@/@tool_dir@/include $CFLAGS" -LDFLAGS="-L@prefix@/@tool_dir@/lib $LDFLAGS" -CPPFLAGS="-I@prefix@/@tool_dir@/include $CPPFLAGS" -CXXFLAGS="-I@prefix@/@tool_dir@/include $CXXFLAGS" +CFLAGS="@native_platform_min_version@ -I@prefix@/@tool_dir@/include $CFLAGS" +LDFLAGS="@native_platform_min_version@ -L@prefix@/@tool_dir@/lib $LDFLAGS" +CPPFLAGS="@native_platform_min_version@ -I@prefix@/@tool_dir@/include $CPPFLAGS" +CXXFLAGS="@native_platform_min_version@ -I@prefix@/@tool_dir@/include $CXXFLAGS" PKG_CONFIG=@prefix@/@tool_dir@/bin/pkg-config export PKG_CONFIG_LIBDIR=@prefix@/@tool_dir@/lib/pkgconfig |