Skip to content

Commit 18bd30c

Browse files
committed
Refactor Bazel configuration to remove macOS-specific flags from hermetic-llvm setup
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 6f4c3e7 commit 18bd30c

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

.bazelrc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ build:hermetic-llvm --incompatible_enable_cc_toolchain_resolution
7171
build:hermetic-llvm --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
7272
build:hermetic-llvm --extra_toolchains @emsdk//emscripten_toolchain:cc-toolchain-wasm
7373

74-
build:hermetic-llvm-macos --config=hermetic-llvm
75-
# Below flags mitigate https://github.com/bazel-contrib/toolchains_llvm/pull/229.
76-
build:hermetic-llvm-macos --features=-libtool
77-
build:hermetic-llvm-macos --features=-supports_dynamic_linker
78-
7974
build --enable_platform_specific_config
8075

8176
# Use C++20.

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
os: macos-15
167167
arch: x86_64
168168
action: test
169-
flags: --config=hermetic-llvm-macos
169+
flags: --config=hermetic-llvm
170170
cache: true
171171
- name: 'WAMR interp on Linux/x86_64'
172172
engine: 'wamr-interp'
@@ -181,7 +181,7 @@ jobs:
181181
os: macos-15
182182
arch: x86_64
183183
action: test
184-
flags: --config=hermetic-llvm-macos
184+
flags: --config=hermetic-llvm
185185
- name: 'WAMR jit on Linux/x86_64'
186186
engine: 'wamr-jit'
187187
repo: 'com_github_bytecodealliance_wasm_micro_runtime'
@@ -198,7 +198,7 @@ jobs:
198198
arch: x86_64
199199
action: test
200200
cache: true
201-
flags: --config=hermetic-llvm-macos
201+
flags: --config=hermetic-llvm
202202
- name: 'WasmEdge on Linux/x86_64'
203203
engine: 'wasmedge'
204204
repo: 'com_github_wasmedge_wasmedge'
@@ -212,7 +212,7 @@ jobs:
212212
os: macos-15
213213
arch: x86_64
214214
action: test
215-
flags: --config=hermetic-llvm-macos
215+
flags: --config=hermetic-llvm
216216
- name: 'Wasmtime on Linux/x86_64'
217217
engine: 'wasmtime'
218218
repo: 'com_github_bytecodealliance_wasmtime'
@@ -250,7 +250,7 @@ jobs:
250250
os: macos-15
251251
arch: x86_64
252252
action: test
253-
flags: --config=hermetic-llvm-macos
253+
flags: --config=hermetic-llvm
254254

255255
steps:
256256
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)