Refactor Bazel configuration to remove macOS-specific flags from hermetic-llvm setup

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

.bazelrc

@@ -71,11 +71,6 @@ build:hermetic-llvm --incompatible_enable_cc_toolchain_resolution
 build:hermetic-llvm --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 build:hermetic-llvm --extra_toolchains @emsdk//emscripten_toolchain:cc-toolchain-wasm
 
-build:hermetic-llvm-macos --config=hermetic-llvm
-# Below flags mitigate https://github.com/bazel-contrib/toolchains_llvm/pull/229.
-build:hermetic-llvm-macos --features=-libtool
-build:hermetic-llvm-macos --features=-supports_dynamic_linker
-
 build --enable_platform_specific_config
 
 # Use C++20.

.github/workflows/test.yml

@@ -166,7 +166,7 @@ jobs:
           os: macos-15
           arch: x86_64
           action: test
-          flags: --config=hermetic-llvm-macos
+          flags: --config=hermetic-llvm
           cache: true
         - name: 'WAMR interp on Linux/x86_64'
           engine: 'wamr-interp'
@@ -181,7 +181,7 @@ jobs:
           os: macos-15
           arch: x86_64
           action: test
-          flags: --config=hermetic-llvm-macos
+          flags: --config=hermetic-llvm
         - name: 'WAMR jit on Linux/x86_64'
           engine: 'wamr-jit'
           repo: 'com_github_bytecodealliance_wasm_micro_runtime'
@@ -198,7 +198,7 @@ jobs:
           arch: x86_64
           action: test
           cache: true
-          flags: --config=hermetic-llvm-macos
+          flags: --config=hermetic-llvm
         - name: 'WasmEdge on Linux/x86_64'
           engine: 'wasmedge'
           repo: 'com_github_wasmedge_wasmedge'
@@ -212,7 +212,7 @@ jobs:
           os: macos-15
           arch: x86_64
           action: test
-          flags: --config=hermetic-llvm-macos
+          flags: --config=hermetic-llvm
         - name: 'Wasmtime on Linux/x86_64'
           engine: 'wasmtime'
           repo: 'com_github_bytecodealliance_wasmtime'
@@ -250,11 +250,16 @@ jobs:
           os: macos-15
           arch: x86_64
           action: test
-          flags: --config=hermetic-llvm-macos
+          flags: --config=hermetic-llvm
 
     steps:
     - uses: actions/checkout@v2
 
+    - name: Compute job hash
+      id: job-hash
+      run: echo "hash=$(echo -n '${{ matrix.name }}' | sha1sum | cut -c1-7)" >> $GITHUB_OUTPUT
+      shell: bash
+
     - name: Install dependencies (Linux)
       if: ${{ matrix.deps != '' && startsWith(matrix.os, 'ubuntu') }}
       run: sudo apt update -y && sudo apt install -y ${{ matrix.deps }}
@@ -275,7 +280,7 @@ jobs:
     - uses: bazel-contrib/[email protected]
       with:
         bazelisk-cache: true
-        disk-cache: ${{ github.job }}-${{ matrix.name }}
+        disk-cache: ${{ github.job }}-${{ steps.job-hash.outputs.hash }}
         repository-cache: true
 
     - name: Download test data