diff --git a/cmake/macos_aarch64_toolchain_clang.cmake b/cmake/macos_aarch64_toolchain_clang.cmake index 23d8d3e..412d2e5 100644 --- a/cmake/macos_aarch64_toolchain_clang.cmake +++ b/cmake/macos_aarch64_toolchain_clang.cmake @@ -3,10 +3,20 @@ set(CMAKE_CROSSCOMPILING TRUE) set(CMAKE_SYSTEM_PROCESSOR aarch64) -set(CMAKE_C_COMPILER /usr/local/bin/aarch64-apple-darwin25-clang) -set(CMAKE_CXX_COMPILER /usr/local/bin/aarch64-apple-darwin25-clang++) -set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin25-as) -set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin25-strip) +if(NOT DEFINED APPLE_DARWIN_TRIPLE) + if(DEFINED ENV{APPLE_DARWIN_TRIPLE}) + set(APPLE_DARWIN_TRIPLE "$ENV{APPLE_DARWIN_TRIPLE}") + else() + set(APPLE_DARWIN_TRIPLE "${CMAKE_SYSTEM_PROCESSOR}-apple-darwin25") + endif() +endif() + +set(CMAKE_C_COMPILER "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-clang") +set(CMAKE_CXX_COMPILER "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-clang++") +set(CMAKE_ASM_COMPILER "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-as") +if(NOT DEFINED CMAKE_STRIP) + set(CMAKE_STRIP "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-strip") +endif() if(NOT DEFINED CMAKE_OSX_SYSROOT) if(DEFINED ENV{SDKROOT} AND IS_DIRECTORY "$ENV{SDKROOT}") diff --git a/cmake/macos_x86_64_toolchain_clang.cmake b/cmake/macos_x86_64_toolchain_clang.cmake index bc4d708..b161b2b 100644 --- a/cmake/macos_x86_64_toolchain_clang.cmake +++ b/cmake/macos_x86_64_toolchain_clang.cmake @@ -3,10 +3,20 @@ set(CMAKE_CROSSCOMPILING TRUE) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(CMAKE_C_COMPILER /usr/local/bin/x86_64-apple-darwin25-clang) -set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-apple-darwin25-clang++) -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 APPLE_DARWIN_TRIPLE) + if(DEFINED ENV{APPLE_DARWIN_TRIPLE}) + set(APPLE_DARWIN_TRIPLE "$ENV{APPLE_DARWIN_TRIPLE}") + else() + set(APPLE_DARWIN_TRIPLE "${CMAKE_SYSTEM_PROCESSOR}-apple-darwin25") + endif() +endif() + +set(CMAKE_C_COMPILER "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-clang") +set(CMAKE_CXX_COMPILER "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-clang++") +set(CMAKE_ASM_COMPILER "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-as") +if(NOT DEFINED CMAKE_STRIP) + set(CMAKE_STRIP "/usr/local/bin/${APPLE_DARWIN_TRIPLE}-strip") +endif() if(NOT DEFINED CMAKE_OSX_SYSROOT) if(DEFINED ENV{SDKROOT} AND IS_DIRECTORY "$ENV{SDKROOT}") diff --git a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh index 5359083..fad108f 100755 --- a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh +++ b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh @@ -28,19 +28,57 @@ 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" -clang_bin="$(command -v aarch64-apple-darwin25-clang || true)" -clangxx_bin="$(command -v aarch64-apple-darwin25-clang++ || true)" -clangas_bin="$(command -v aarch64-apple-darwin25-as || true)" -install_name_tool_bin="$(command -v aarch64-apple-darwin25-install_name_tool || true)" -if [ -z "$clang_bin" ] || [ -z "$clangxx_bin" ] || [ -z "$clangas_bin" ]; then +detect_darwin_triple() { + arch="$1" + if [ -n "${APPLE_DARWIN_TRIPLE:-}" ]; then + printf '%s\n' "$APPLE_DARWIN_TRIPLE" + return 0 + fi + + best="" + best_version=-1 + for bin in /usr/local/bin/${arch}-apple-darwin*-clang; do + [ -e "$bin" ] || continue + base=$(basename "$bin") + prefix=${base%-clang} + version=${prefix##*-darwin} + case "$version" in + ''|*[!0-9]*) continue ;; + esac + if [ "$version" -gt "$best_version" ]; then + best="$prefix" + best_version="$version" + fi + done + + if [ -n "$best" ]; then + printf '%s\n' "$best" + return 0 + fi + + return 1 +} + +darwin_triple="$(detect_darwin_triple aarch64 || true)" +if [ -z "$darwin_triple" ]; then echo "macOS cross toolchain binaries not found in PATH" >&2 exit 1 fi +export APPLE_DARWIN_TRIPLE="$darwin_triple" + +clang_bin="$(command -v "${darwin_triple}-clang" || true)" +clangxx_bin="$(command -v "${darwin_triple}-clang++" || true)" +clangas_bin="$(command -v "${darwin_triple}-as" || true)" +install_name_tool_bin="$(command -v "${darwin_triple}-install_name_tool" || true)" +if [ -z "$clang_bin" ] || [ -z "$clangxx_bin" ] || [ -z "$clangas_bin" ]; then + echo "macOS cross toolchain binaries not found in PATH (prefix ${darwin_triple})" >&2 + exit 1 +fi if [ -z "$install_name_tool_bin" ]; then - install_name_tool_bin="$(dirname "$clang_bin")/aarch64-apple-darwin25-install_name_tool" + install_name_tool_bin="$(dirname "$clang_bin")/${darwin_triple}-install_name_tool" fi if [ ! -x "$install_name_tool_bin" ]; then - echo "macOS install_name_tool not found (looked for aarch64-apple-darwin25-install_name_tool)" >&2 + echo "macOS install_name_tool not found (looked for ${darwin_triple}-install_name_tool)" >&2 exit 1 fi @@ -98,15 +136,19 @@ EOF wrapper_dir="$(mktemp -d)" trap "rm -rf '$wrapper_dir'" EXIT -cc_wrapper="$wrapper_dir/aarch64-apple-darwin25-clang" -cxx_wrapper="$wrapper_dir/aarch64-apple-darwin25-clang++" -as_wrapper="$wrapper_dir/aarch64-apple-darwin25-as" +cc_wrapper="$wrapper_dir/${darwin_triple}-clang" +cxx_wrapper="$wrapper_dir/${darwin_triple}-clang++" +as_wrapper="$wrapper_dir/${darwin_triple}-as" wrap_compiler "$clang_bin" "$cc_wrapper" wrap_compiler "$clangxx_bin" "$cxx_wrapper" wrap_compiler "$clangas_bin" "$as_wrapper" -cmake_compiler_args="-DCMAKE_C_COMPILER=$cc_wrapper -DCMAKE_CXX_COMPILER=$cxx_wrapper -DCMAKE_ASM_COMPILER=$as_wrapper" +cmake_compiler_args="-DCMAKE_C_COMPILER=$cc_wrapper -DCMAKE_CXX_COMPILER=$cxx_wrapper -DCMAKE_ASM_COMPILER=$as_wrapper -DAPPLE_DARWIN_TRIPLE=$darwin_triple" +strip_bin="$(command -v "${darwin_triple}-strip" || true)" +if [ -n "$strip_bin" ]; then + cmake_compiler_args="$cmake_compiler_args -DCMAKE_STRIP=$strip_bin" +fi cd /p2pool/external/src/curl cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" $cmake_osx_args $cmake_compiler_args -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include diff --git a/scripts/release/macos_x64/p2pool_macos_x64.sh b/scripts/release/macos_x64/p2pool_macos_x64.sh index 2fbade4..df80eb8 100755 --- a/scripts/release/macos_x64/p2pool_macos_x64.sh +++ b/scripts/release/macos_x64/p2pool_macos_x64.sh @@ -28,19 +28,57 @@ 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" -clang_bin="$(command -v x86_64-apple-darwin25-clang || true)" -clangxx_bin="$(command -v x86_64-apple-darwin25-clang++ || true)" -clangas_bin="$(command -v x86_64-apple-darwin25-as || true)" -install_name_tool_bin="$(command -v x86_64-apple-darwin25-install_name_tool || true)" -if [ -z "$clang_bin" ] || [ -z "$clangxx_bin" ] || [ -z "$clangas_bin" ]; then +detect_darwin_triple() { + arch="$1" + if [ -n "${APPLE_DARWIN_TRIPLE:-}" ]; then + printf '%s\n' "$APPLE_DARWIN_TRIPLE" + return 0 + fi + + best="" + best_version=-1 + for bin in /usr/local/bin/${arch}-apple-darwin*-clang; do + [ -e "$bin" ] || continue + base=$(basename "$bin") + prefix=${base%-clang} + version=${prefix##*-darwin} + case "$version" in + ''|*[!0-9]*) continue ;; + esac + if [ "$version" -gt "$best_version" ]; then + best="$prefix" + best_version="$version" + fi + done + + if [ -n "$best" ]; then + printf '%s\n' "$best" + return 0 + fi + + return 1 +} + +darwin_triple="$(detect_darwin_triple x86_64 || true)" +if [ -z "$darwin_triple" ]; then echo "macOS cross toolchain binaries not found in PATH" >&2 exit 1 fi +export APPLE_DARWIN_TRIPLE="$darwin_triple" + +clang_bin="$(command -v "${darwin_triple}-clang" || true)" +clangxx_bin="$(command -v "${darwin_triple}-clang++" || true)" +clangas_bin="$(command -v "${darwin_triple}-as" || true)" +install_name_tool_bin="$(command -v "${darwin_triple}-install_name_tool" || true)" +if [ -z "$clang_bin" ] || [ -z "$clangxx_bin" ] || [ -z "$clangas_bin" ]; then + echo "macOS cross toolchain binaries not found in PATH (prefix ${darwin_triple})" >&2 + exit 1 +fi if [ -z "$install_name_tool_bin" ]; then - install_name_tool_bin="$(dirname "$clang_bin")/x86_64-apple-darwin25-install_name_tool" + install_name_tool_bin="$(dirname "$clang_bin")/${darwin_triple}-install_name_tool" fi if [ ! -x "$install_name_tool_bin" ]; then - echo "macOS install_name_tool not found (looked for x86_64-apple-darwin25-install_name_tool)" >&2 + echo "macOS install_name_tool not found (looked for ${darwin_triple}-install_name_tool)" >&2 exit 1 fi @@ -98,15 +136,19 @@ EOF wrapper_dir="$(mktemp -d)" trap "rm -rf '$wrapper_dir'" EXIT -cc_wrapper="$wrapper_dir/x86_64-apple-darwin25-clang" -cxx_wrapper="$wrapper_dir/x86_64-apple-darwin25-clang++" -as_wrapper="$wrapper_dir/x86_64-apple-darwin25-as" +cc_wrapper="$wrapper_dir/${darwin_triple}-clang" +cxx_wrapper="$wrapper_dir/${darwin_triple}-clang++" +as_wrapper="$wrapper_dir/${darwin_triple}-as" wrap_compiler "$clang_bin" "$cc_wrapper" wrap_compiler "$clangxx_bin" "$cxx_wrapper" wrap_compiler "$clangas_bin" "$as_wrapper" -cmake_compiler_args="-DCMAKE_C_COMPILER=$cc_wrapper -DCMAKE_CXX_COMPILER=$cxx_wrapper -DCMAKE_ASM_COMPILER=$as_wrapper" +cmake_compiler_args="-DCMAKE_C_COMPILER=$cc_wrapper -DCMAKE_CXX_COMPILER=$cxx_wrapper -DCMAKE_ASM_COMPILER=$as_wrapper -DAPPLE_DARWIN_TRIPLE=$darwin_triple" +strip_bin="$(command -v "${darwin_triple}-strip" || true)" +if [ -n "$strip_bin" ]; then + cmake_compiler_args="$cmake_compiler_args -DCMAKE_STRIP=$strip_bin" +fi cd /p2pool/external/src/curl cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" $cmake_osx_args $cmake_compiler_args -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include