maybe fix asan build

oven-sh · Feb 5, 2025 · 851aabf · 851aabf
1 parent c917ff4
commit 851aabf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,13 +31,14 @@ jobs:
             package_json_arch: "x64"
             CMAKE_BUILD_TYPE: Debug
           - runner: macos-13-large
-            cpp_flags: "-D_LIBCXX_ENABLE_ASSERTIONS=1 -DENABLE_SANITIZERS=address"
+            cpp_flags: "-D_LIBCXX_ENABLE_ASSERTIONS=1"
             cpu: haswell
             label: bun-webkit-macos-amd64-debug-asan
             brew_prefix: /usr/local/opt
             package_json_arch: "x64"
             CMAKE_BUILD_TYPE: Debug
             ENABLE_MALLOC_HEAP_BREAKDOWN: "OFF"
+            ENABLE_SANITIZERS: "address"
           - runner: macos-13-xlarge
             cpp_flags: "-D_LIBCXX_ENABLE_ASSERTIONS=1"
             cpu: native
@@ -46,13 +47,14 @@ jobs:
             package_json_arch: "arm64"
             CMAKE_BUILD_TYPE: Debug
           - runner: macos-13-xlarge
-            cpp_flags: "-D_LIBCXX_ENABLE_ASSERTIONS=1 -DENABLE_SANITIZERS=address"
+            cpp_flags: "-D_LIBCXX_ENABLE_ASSERTIONS=1"
             cpu: native
             label: bun-webkit-macos-arm64-debug-asan
             brew_prefix: /opt/homebrew/opt
             package_json_arch: "arm64"
             CMAKE_BUILD_TYPE: Debug
             ENABLE_MALLOC_HEAP_BREAKDOWN: "OFF"
+            ENABLE_SANITIZERS: "address"
           # We aren't doing LTO on macOS, for now.
           # - runner: macos-13-large
           #   cpp_flags: -flto=full -fwhole-program-vtables -fforce-emit-vtables -D_LIBCXX_ENABLE_ASSERTIONS=0
@@ -121,6 +123,7 @@ jobs:
           PACKAGE_JSON_ARCH: ${{matrix.package_json_arch}}
           PACKAGE_JSON_LABEL: ${{matrix.label}}
           ENABLE_MALLOC_HEAP_BREAKDOWN: ${{matrix.ENABLE_MALLOC_HEAP_BREAKDOWN}}
+          ENABLE_SANITIZERS: ${{matrix.ENABLE_SANITIZERS}}
         run: GITHUB_REPOSITORY=$GITHUB_REPOSITORY bash mac-release.bash
       - uses: actions/upload-artifact@v4
         with:

diff --git a/mac-release.bash b/mac-release.bash
@@ -27,6 +27,8 @@ fi
 
 ENABLE_MALLOC_HEAP_BREAKDOWN=${ENABLE_MALLOC_HEAP_BREAKDOWN:-$DEFAULT_MALLOC_HEAP_BREAKDOWN}
 
+echo "Building for mac: [ $ENABLE_MALLOC_HEAP_BREAKDOWN ] [ $ENABLE_SANITIZERS ]"
+
 rm -rf $RUNNER_TEMP/webkit-release $RUNNER_TEMP/bun-webkit $RUNNER_TEMP/bun-webkit $RUNNER_TEMP/bun-webkit.tar.gz
 mkdir -p $RUNNER_TEMP/webkit-release
 cd $RUNNER_TEMP/webkit-release
@@ -53,6 +55,7 @@ cmake \
     -DPTHREAD_JIT_PERMISSIONS_API=1 \
     -DUSE_PTHREAD_JIT_PERMISSIONS_API=ON \
     -DENABLE_REMOTE_INSPECTOR=ON \
+    -DENABLE_SANITIZERS="$ENABLE_SANITIZERS" \
     $THIS_DIR \
     $RUNNER_TEMP/webkit-release &&
     cmake --build $RUNNER_TEMP/webkit-release --config $CMAKE_BUILD_TYPE --target jsc