FOSSbench/app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macOS ARM64 release detection

Browse Source
This commit is contained in:
owen
2026-07-19 16:58:46 -05:00
parent 9a13869052
commit 2dc8244057
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release.yml
+9 -3
View File
@@ -143,9 +143,15 @@ jobs:
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.target == 'macos-amd64' && '10.5' || '' }} MACOSX_DEPLOYMENT_TARGET: ${{ matrix.target == 'macos-amd64' && '10.5' || '' }}
run: | run: |
OPENSSL_LIBDIR="$(find "$GITHUB_WORKSPACE/openssl-static" -type f -name libssl.a -exec dirname {} \;)" OPENSSL_LIBDIR="$(find "$GITHUB_WORKSPACE/openssl-static" -type f -name libssl.a -exec dirname {} \;)"
make "${{ matrix.target }}" \ build_log="$(mktemp)"
TLS_CFLAGS="-I$GITHUB_WORKSPACE/openssl-static/include" \ if ! make "${{ matrix.target }}" \
TLS_LDLIBS="$OPENSSL_LIBDIR/libssl.a $OPENSSL_LIBDIR/libcrypto.a" TLS_CFLAGS="-I$GITHUB_WORKSPACE/openssl-static/include" \
TLS_LDLIBS="$OPENSSL_LIBDIR/libssl.a $OPENSSL_LIBDIR/libcrypto.a" \
2>&1 | tee "$build_log"; then
message="$(tail -40 "$build_log" | tr '\n' ' ')"
echo "::error title=macOS build failed::$message"
exit 1
fi
if otool -L "dist/fossbench-${{ matrix.target }}" | grep -E 'lib(ssl|crypto)'; then if otool -L "dist/fossbench-${{ matrix.target }}" | grep -E 'lib(ssl|crypto)'; then
echo 'macOS release uses dynamic OpenSSL' >&2 echo 'macOS release uses dynamic OpenSSL' >&2
exit 1 exit 1
src/app/benchmark.c
+1 -1
View File
@@ -35,7 +35,7 @@
#endif #endif
#define FB_VERSION "0.2.1" #define FB_VERSION "0.2.1"
#if defined(__aarch64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
# define D_INT "64-bit ALU: madd, umulh, udiv, bitops" # define D_INT "64-bit ALU: madd, umulh, udiv, bitops"
# define D_FP "double: fmadd, fdiv, fsqrt" # define D_FP "double: fmadd, fdiv, fsqrt"
# define D_SIMD "NEON ASIMD: 128-bit integer + float" # define D_SIMD "NEON ASIMD: 128-bit integer + float"
src/app/hw_detect.c
+2 -2
View File
@@ -33,7 +33,7 @@
# define HW_OS "POSIX" # define HW_OS "POSIX"
#endif #endif
#if defined(__aarch64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
# define HW_ARCH "ARM64" # define HW_ARCH "ARM64"
#elif defined(__x86_64__) || defined(_M_X64) #elif defined(__x86_64__) || defined(_M_X64)
# define HW_ARCH "x86-64" # define HW_ARCH "x86-64"
@@ -445,7 +445,7 @@ void hw_detect_system(struct system_info *info)
case 0x17d5b93au: name = "Apple M4"; break; case 0x17d5b93au: name = "Apple M4"; break;
} }
} }
#if defined(__aarch64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
if (name == NULL) name = "Apple M-series"; if (name == NULL) name = "Apple M-series";
#endif #endif
if (name != NULL) snprintf(info->cpu, sizeof info->cpu, "%s", name); if (name != NULL) snprintf(info->cpu, sizeof info->cpu, "%s", name);