Update to macOS 14.5 SDK

YosysHQ · Jan 22, 2025 · 7b51c3e · 7b51c3e
1 parent 6b56fe5
commit 7b51c3e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/default/scripts/smt-switch.sh b/default/scripts/smt-switch.sh
@@ -15,7 +15,7 @@ fi
 if [ ${ARCH_BASE} == 'darwin' ]; then
     sed -i -re 's,linux,l1nux,g' scripts/repack-static-lib.sh 
     sed -i -re 's,darwin,linux,g' scripts/repack-static-lib.sh 
-    sed -i -re 's,libtool,x86_64-apple-darwin22.4-libtool,g' scripts/repack-static-lib.sh 
+    sed -i -re 's,libtool,x86_64-apple-darwin23.5-libtool,g' scripts/repack-static-lib.sh 
 fi
 ./configure.sh --cvc5 --cvc5-home=${BUILD_DIR}/cvc5/dev --btor-home=${BUILD_DIR}/boolector/dev --prefix=${INSTALL_PREFIX} --static --smtlib-reader
 cd build

diff --git a/docker/cross-darwin-arm64/Dockerfile.22 b/docker/cross-darwin-arm64/Dockerfile.22
@@ -38,8 +38,8 @@ RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 18 && \
 # Taken from https://github.com/joseluisq/rust-linux-darwin-builder
 
 # Mac OS X SDK version
-ARG OSX_SDK_VERSION=13.3
-ARG OSX_SDK_SUM=518e35eae6039b3f64e8025f4525c1c43786cc5cf39459d609852faf091e34be
+ARG OSX_SDK_VERSION=14.5
+ARG OSX_SDK_SUM=6e146275d19f027faa2e8354da5e0267513abf013b8f16ad65a231653a2b1c5d
 ARG OSX_VERSION_MIN=11.0
 
 # OS X Cross
@@ -70,7 +70,7 @@ RUN set -eux \
     && true
 
 
-ENV CROSS_NAME aarch64-apple-darwin22.4
+ENV CROSS_NAME aarch64-apple-darwin23.5
 
 ENV CROSS_PREFIX /opt/${CROSS_NAME}
 
@@ -87,8 +87,8 @@ ENV PATH /usr/local/osxcross/target/bin:$PATH
 RUN rustup target add aarch64-apple-darwin && \
     mkdir -p /.cargo && \
     echo "[target.aarch64-apple-darwin]" > /.cargo/config && \
-    echo "linker = \"aarch64-apple-darwin22.4-clang\"" >> /.cargo/config && \
-    echo "ar = \"aarch64-apple-darwin22.4-ar\"" >> /.cargo/config
+    echo "linker = \"aarch64-apple-darwin23.5-clang\"" >> /.cargo/config && \
+    echo "ar = \"aarch64-apple-darwin23.5-ar\"" >> /.cargo/config
 
 
 COPY Toolchain.cmake ${CROSS_PREFIX}/

diff --git a/docker/cross-darwin-arm64/Toolchain.cmake b/docker/cross-darwin-arm64/Toolchain.cmake
@@ -11,7 +11,7 @@ SET(CMAKE_RANLIB $ENV{RANLIB} CACHE FILEPATH "Ranlib")
 
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
 
-SET(CMAKE_OSX_SYSROOT /usr/local/osxcross/target/SDK/MacOSX13.3.sdk/)
+SET(CMAKE_OSX_SYSROOT /usr/local/osxcross/target/SDK/MacOSX14.5.sdk/)
 SET(CMAKE_EXE_LINKER_FLAGS "-v" CACHE STRING "Flags")
 
 SET(CMAKE_FIND_ROOT_PATH /usr/local/osxcross/target/macports/pkgs/opt/local/)

diff --git a/docker/cross-darwin-x64/Dockerfile.22 b/docker/cross-darwin-x64/Dockerfile.22
@@ -38,8 +38,8 @@ RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 18 && \
 # Taken from https://github.com/joseluisq/rust-linux-darwin-builder
 
 # Mac OS X SDK version
-ARG OSX_SDK_VERSION=13.3
-ARG OSX_SDK_SUM=518e35eae6039b3f64e8025f4525c1c43786cc5cf39459d609852faf091e34be
+ARG OSX_SDK_VERSION=14.5
+ARG OSX_SDK_SUM=6e146275d19f027faa2e8354da5e0267513abf013b8f16ad65a231653a2b1c5d
 ARG OSX_VERSION_MIN=11.0
 
 # OS X Cross
@@ -70,7 +70,7 @@ RUN set -eux \
     && true
 
 
-ENV CROSS_NAME x86_64-apple-darwin22.4
+ENV CROSS_NAME x86_64-apple-darwin23.5
 
 ENV CROSS_PREFIX /opt/${CROSS_NAME}
 
@@ -87,8 +87,8 @@ ENV PATH /usr/local/osxcross/target/bin:$PATH
 RUN rustup target add x86_64-apple-darwin && \
     mkdir -p /.cargo && \
     echo "[target.x86_64-apple-darwin]" > /.cargo/config && \
-    echo "linker = \"x86_64-apple-darwin22.4-clang\"" >> /.cargo/config && \
-    echo "ar = \"x86_64-apple-darwin22.4-ar\"" >> /.cargo/config
+    echo "linker = \"x86_64-apple-darwin23.5-clang\"" >> /.cargo/config && \
+    echo "ar = \"x86_64-apple-darwin23.5-ar\"" >> /.cargo/config
 
 
 COPY Toolchain.cmake ${CROSS_PREFIX}/

diff --git a/docker/cross-darwin-x64/Toolchain.cmake b/docker/cross-darwin-x64/Toolchain.cmake
@@ -11,7 +11,7 @@ SET(CMAKE_RANLIB $ENV{RANLIB} CACHE FILEPATH "Ranlib")
 
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
 
-SET(CMAKE_OSX_SYSROOT /usr/local/osxcross/target/SDK/MacOSX13.3.sdk/)
+SET(CMAKE_OSX_SYSROOT /usr/local/osxcross/target/SDK/MacOSX14.5.sdk/)
 SET(CMAKE_EXE_LINKER_FLAGS "-v" CACHE STRING "Flags")
 
 SET(CMAKE_FIND_ROOT_PATH /usr/local/osxcross/target/macports/pkgs/opt/local/)