From 1b469b9f51097c6536f711750a45b97b8eed337e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Sun, 29 Oct 2023 13:35:06 -0400 Subject: [PATCH] [ci] Specify xcode sdk for create-sdk-mac.sh --- ci/create-sdk-mac.sh | 3 ++- ci/osx-package.build.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/create-sdk-mac.sh b/ci/create-sdk-mac.sh index cbf717551a..fa648b82f4 100755 --- 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 index a3688c326a..f51f8da570 100755 --- 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" \