4040 export CXX=$(find "$TOOLCHAIN" \( -type f -o -type l \) -name 'aarch64-apple-darwin*-clang++' | head -n 1)
4141 export AR=$(find "$TOOLCHAIN" \( -type f -o -type l \) -name 'aarch64-apple-darwin*-ar' | head -n 1)
4242 export AR_aarch64_apple_darwin=$AR
43- export CFLAGS_aarch64_apple_darwin="$CFLAGS"
44- export LDFLAGS_aarch64_apple_darwin="$LDFLAGS"
4543
4644 if [ -z "$CC" ]; then
4745 echo "Error: couldn't find aarch64 clang in $TOOLCHAIN"
@@ -53,13 +51,13 @@ jobs:
5351 export SDKROOT="$OSXCROSS/SDK/MacOSX${SDK_VERSION}.sdk"
5452 ls -l "$SDKROOT"
5553 export MACOSX_DEPLOYMENT_TARGET=11.0
56- export CFLAGS="-isysroot $SDKROOT -arch arm64 -mmacosx-version-min=11.0"
57- export LDFLAGS="-isysroot $SDKROOT -arch arm64"
54+ export CFLAGS="-isysroot $SDKROOT -arch arm64 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
55+ export LDFLAGS="-isysroot $SDKROOT -arch arm64 -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
56+ export CFLAGS_aarch64_apple_darwin="$CFLAGS"
57+ export LDFLAGS_aarch64_apple_darwin="$LDFLAGS"
5858 export PKG_CONFIG_ALLOW_CROSS=1
5959 export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER=$CC
6060 export CC_aarch64_apple_darwin="$CC"
61- export CFLAGS_aarch64_apple_darwin="-isysroot $SDKROOT -arch arm64 -mmacosx-version-min=11.0"
62- export LDFLAGS_aarch64_apple_darwin="-isysroot $SDKROOT -arch arm64"
6361
6462 echo "Using CC=$CC"
6563 $CC --version || (echo "clang executable broken" && exit 1)
7371 with :
7472 name : zauth-macos-arm64
7573 path : libs/libzauth/libzauth-c/target/aarch64-apple-darwin/release/zauth
74+
75+ - name : Upload config.log on failure
76+ if : failure()
77+ uses : actions/upload-artifact@v4
78+ with :
79+ name : libsodium-config-log
80+ path : libs/libzauth/libzauth-c/target/aarch64-apple-darwin/release/build/libsodium-sys-*/out/
0 commit comments