From 4f9d40f396f6b6f2b0cd6210abdbc34e9daade5a Mon Sep 17 00:00:00 2001 From: t1amak Date: Thu, 13 Nov 2025 19:17:27 +0000 Subject: [PATCH] macos build fix 3 --- cmake/macos_aarch64_toolchain_clang.cmake | 4 ++-- cmake/macos_x86_64_toolchain_clang.cmake | 4 ++-- scripts/release/macos_aarch64/p2pool_macos_aarch64.sh | 2 +- scripts/release/macos_x64/p2pool_macos_x64.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/macos_aarch64_toolchain_clang.cmake b/cmake/macos_aarch64_toolchain_clang.cmake index 13ab8ca..90342ec 100644 --- a/cmake/macos_aarch64_toolchain_clang.cmake +++ b/cmake/macos_aarch64_toolchain_clang.cmake @@ -9,8 +9,8 @@ set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin25-as) set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin25-strip) if(NOT DEFINED CMAKE_OSX_SYSROOT) - execute_process( - COMMAND ${CMAKE_C_COMPILER} --print-sysroot +execute_process( + COMMAND ${CMAKE_C_COMPILER} -print-sysroot OUTPUT_VARIABLE _OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE ) diff --git a/cmake/macos_x86_64_toolchain_clang.cmake b/cmake/macos_x86_64_toolchain_clang.cmake index f72dc0b..9034d6b 100644 --- a/cmake/macos_x86_64_toolchain_clang.cmake +++ b/cmake/macos_x86_64_toolchain_clang.cmake @@ -9,8 +9,8 @@ set(CMAKE_ASM_COMPILER /usr/local/bin/x86_64-apple-darwin25-as) set(CMAKE_STRIP /usr/local/bin/x86_64-apple-darwin25-strip) if(NOT DEFINED CMAKE_OSX_SYSROOT) - execute_process( - COMMAND ${CMAKE_C_COMPILER} --print-sysroot +execute_process( + COMMAND ${CMAKE_C_COMPILER} -print-sysroot OUTPUT_VARIABLE _OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE ) diff --git a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh index e9b623a..944668c 100755 --- a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh +++ b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh @@ -19,7 +19,7 @@ flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_T flags_libs="-Os -flto -w $flags_size $flags_datetime" flags_p2pool="$flags_size $flags_datetime" -sdk_sysroot="$(/usr/local/bin/aarch64-apple-darwin25-clang --print-sysroot)" +sdk_sysroot="$(/usr/local/bin/aarch64-apple-darwin25-clang -print-sysroot)" export SDKROOT="$sdk_sysroot" cmake_osx_args="-DCMAKE_OSX_SYSROOT=$sdk_sysroot -DCMAKE_SYSROOT=$sdk_sysroot -DCMAKE_SYSTEM_FRAMEWORK_PATH=$sdk_sysroot/System/Library/Frameworks" diff --git a/scripts/release/macos_x64/p2pool_macos_x64.sh b/scripts/release/macos_x64/p2pool_macos_x64.sh index bd7a8c5..8aa98a3 100755 --- a/scripts/release/macos_x64/p2pool_macos_x64.sh +++ b/scripts/release/macos_x64/p2pool_macos_x64.sh @@ -19,7 +19,7 @@ flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_T flags_libs="-Os -flto -w $flags_size $flags_datetime" flags_p2pool="$flags_size $flags_datetime" -sdk_sysroot="$(/usr/local/bin/x86_64-apple-darwin25-clang --print-sysroot)" +sdk_sysroot="$(/usr/local/bin/x86_64-apple-darwin25-clang -print-sysroot)" export SDKROOT="$sdk_sysroot" cmake_osx_args="-DCMAKE_OSX_SYSROOT=$sdk_sysroot -DCMAKE_SYSROOT=$sdk_sysroot -DCMAKE_SYSTEM_FRAMEWORK_PATH=$sdk_sysroot/System/Library/Frameworks"