From fdfac9d95134fb5637bb2a9ec98ee11fe188230e Mon Sep 17 00:00:00 2001 From: "H. Utku Maden" Date: Sat, 6 Apr 2024 15:57:37 +0300 Subject: [PATCH] Update build scripts to include OSX. --- cmake/osx-arm64.cmake | 2 +- cmake/osx-x64.cmake | 2 +- sh/quik_build_native.sh | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/osx-arm64.cmake b/cmake/osx-arm64.cmake index b708f77..cc74295 100644 --- a/cmake/osx-arm64.cmake +++ b/cmake/osx-arm64.cmake @@ -1,7 +1,7 @@ # QUIK Toolchain file for OSX-ARM64 systems. # Copyright (C) 2024 -set(CMAKE_SYSTEM_NAME OSX) +set(CMAKE_SYSTEM_NAME Darwin) set(CMAKE_C_COMPILER aarch64-apple-darwin23-clang) set(CMAKE_CXX_COMPILER aarch64-apple-darwin23-clang++) diff --git a/cmake/osx-x64.cmake b/cmake/osx-x64.cmake index 5af58d8..092fd3b 100644 --- a/cmake/osx-x64.cmake +++ b/cmake/osx-x64.cmake @@ -1,7 +1,7 @@ # QUIK Toolchain file for OSX-ARM64 systems. # Copyright (C) 2024 -set(CMAKE_SYSTEM_NAME OSX) +set(CMAKE_SYSTEM_NAME Darwin) set(CMAKE_C_COMPILER x86_64-apple-darwin23-clang) set(CMAKE_CXX_COMPILER x86_64-apple-darwin23-clang++) diff --git a/sh/quik_build_native.sh b/sh/quik_build_native.sh index ca6cf16..983f996 100755 --- a/sh/quik_build_native.sh +++ b/sh/quik_build_native.sh @@ -16,7 +16,7 @@ fi if [ -z "$ARCHS" ] then - ARCHS="linux-arm linux-arm64 linux-x64 win-x64 win-x86" + ARCHS="linux-arm linux-arm64 linux-x64 win-x64 win-x86 osx-arm64 osx-x64" fi if [ -z "$DST" ] @@ -43,8 +43,6 @@ for ARCH in $ARCHS; do cmake -B $BUILD -S $SRC \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS=-static-libgcc \ - -DCMAKE_CXX_FLAGS=-static-libgcc \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN \ $QUIK_ADDITIONAL_CMAKE