[vlc-commits] macOS build.sh: Use default macosx SDK for xcodebuild targets

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Nov 16 20:22:20 2020 +0100| [35601c58e182dc18601dfd3f8bc00d861d025878] | committer: David Fuhrmann

macOS build.sh: Use default macosx SDK for xcodebuild targets

xcodebuild only allows to use an SDK which is bundled inside the
corresponding Xcode.app package. If you pass a different SDK
stored in another location, it bails out with:

xcodebuild: error: SDK "..." cannot be located.

Therefore, do not set an external SDK for contribs, but use
the default one.

This restores the behaviour we had previously for the 3.x branch.

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

 extras/package/macosx/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index d663cb4bfe..87a3129bb5 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -218,7 +218,8 @@ 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 $SDKROOT WARNING_CFLAGS=-Werror=partial-availability"
+# xcodebuild only allows to set a build-in sdk, not a custom one. Therefore use the default included SDK here
+export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk macosx WARNING_CFLAGS=-Werror=partial-availability"
 
 info "Building contribs"
 spushd "${vlcroot}/contrib"