[ci] Specify xcode sdk for create-sdk-mac.sh

ossia · Oct 29, 2023 · 1b469b9 · 1b469b9
1 parent 8722a32
commit 1b469b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ci/create-sdk-mac.sh b/ci/create-sdk-mac.sh
@@ -2,6 +2,7 @@
 
 : "$SDK_DIR"
 : "$SCORE_DIR"
+: "$XCODE_ROOT"
 
 export OSSIA_SDK="/opt/ossia-sdk-x86_64"
 export DST="$SDK_DIR"
@@ -15,7 +16,7 @@ mkdir -p "$LIB/cmake/score"
 export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $SCRIPTDIR/create-sdk-common.sh
 
-export XCODE=/Applications/Xcode.app/Contents/Developer
+export XCODE=$XCODE_ROOT/Contents/Developer
 export XCODE_MACOS_SDK=$XCODE/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
 export XCODE_MACOS_FRAMEWORKS=$XCODE_MACOS_SDK/System/Library/Frameworks
 export XCODE_TOOLCHAIN=$XCODE/Toolchains/XcodeDefault.xctoolchain

diff --git a/ci/osx-package.build.sh b/ci/osx-package.build.sh
@@ -4,7 +4,8 @@ export OSSIA_SDK=/opt/ossia-sdk-x86_64
 export SCORE_DIR="$PWD"
 export SDK_DIR="$PWD/SDK"
 export PATH=/usr/local/bin:$PATH
-sudo xcode-select -s /Applications/Xcode_15.0.app
+export XCODE_ROOT=/Applications/Xcode_15.0.app
+sudo xcode-select -s $XCODE_ROOT
 
 xcrun /usr/local/bin/cninja macos-release -- \
   -DOSSIA_SDK="$OSSIA_SDK" \