Skip to content

Commit fe5e873

Browse files
neodix42EmelyanenkoK
authored andcommitted
Fix failing Github MacOS actions due to updated XCode (#1800)
* add libgslcblas into portable binaries * remove commented line * update target OSX for macos 15 * ensure system headers come from the right macOS SDK.
1 parent cac968f commit fe5e873

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

.github/workflows/build-ton-macos-15-arm64-shared.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
git submodule update
3737
cp assembly/native/build-macos-shared.sh .
3838
chmod +x build-macos-shared.sh
39-
./build-macos-shared.sh -t -c -o 15.0
39+
./build-macos-shared.sh -t -c -o 16.0
4040
ccache -sp
4141
4242
- name: Run Tests

assembly/native/build-macos-portable.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ fi
127127
cmake -GNinja .. \
128128
-DPORTABLE=1 \
129129
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=$OSX_TARGET \
130+
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
131+
-DCMAKE_SYSROOT=$(xcrun --show-sdk-path) \
130132
-DCMAKE_BUILD_TYPE=Release \
131133
-DOPENSSL_FOUND=1 \
132134
-DOPENSSL_INCLUDE_DIR=$opensslPath/include \

assembly/native/build-macos-shared.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ brew install openssl@3
7979
brew unlink openssl@3 && brew link --overwrite openssl@3
8080

8181
cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
82+
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
83+
-DCMAKE_SYSROOT=$(xcrun --show-sdk-path) \
8284
-DLZ4_FOUND=1 \
8385
-DLZ4_LIBRARIES=$lz4Path/lib/liblz4.a \
8486
-DLZ4_INCLUDE_DIRS=$lz4Path/lib

0 commit comments

Comments
 (0)