[vlc-commits] macOS build.sh: Drop OSX_VERSION

David Fuhrmann git at videolan.org
Sun Nov 15 18:23:24 CET 2020


vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Thu Nov 12 20:37:42 2020 +0100| [399b29adb151bb1cdaa007b4e76189a30e171c08] | committer: David Fuhrmann

macOS build.sh: Drop OSX_VERSION

This is not needed anymore.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=399b29adb151bb1cdaa007b4e76189a30e171c08
---

 extras/package/macosx/build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 88d57aa4a2..d663cb4bfe 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -10,7 +10,6 @@ info()
 
 ARCH="x86_64"
 MINIMAL_OSX_VERSION="10.7"
-OSX_VERSION=$(xcrun --show-sdk-version)
 OSX_KERNELVERSION=`uname -r | cut -d. -f1`
 SDKROOT=$(xcrun --show-sdk-path)
 VLCBUILDDIR=""
@@ -135,7 +134,6 @@ fi
 export CC="`xcrun --find clang`"
 export CXX="`xcrun --find clang++`"
 export OBJC="`xcrun --find clang`"
-export OSX_VERSION
 export SDKROOT
 export PATH="${vlcroot}/extras/tools/build/bin:${vlcroot}/contrib/${TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
 
@@ -220,7 +218,7 @@ export OBJCFLAGS="-Werror=partial-availability"
 
 export EXTRA_CFLAGS="-isysroot $SDKROOT -mmacosx-version-min=$MINIMAL_OSX_VERSION -DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION"
 export EXTRA_LDFLAGS="-Wl,-syslibroot,$SDKROOT -mmacosx-version-min=$MINIMAL_OSX_VERSION -isysroot $SDKROOT -DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION"
-export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk macosx$OSX_VERSION WARNING_CFLAGS=-Werror=partial-availability"
+export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk $SDKROOT WARNING_CFLAGS=-Werror=partial-availability"
 
 info "Building contribs"
 spushd "${vlcroot}/contrib"



More information about the vlc-commits mailing list