Skip to content

Commit 69b1316

Browse files
antiagainstliuyunqi20
authored andcommitted
[CI][macOS] Pin LLVM version and install lld (#4831)
Pinned LLVM to v19; cannot do the same for LLD though. This allows us to revert #4827.
1 parent ce40d12 commit 69b1316

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ jobs:
460460
- name: Install brew dependencies
461461
run: |
462462
brew update
463-
brew install ccache llvm
463+
brew install ccache llvm@19 lld
464464
- name: Compute cache keys
465465
id: cache-key
466466
run: |

.github/workflows/integration-tests.yml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ jobs:
439439
- name: Install brew dependencies
440440
run: |
441441
brew update
442-
brew install ccache llvm
442+
brew install ccache llvm@19 lld
443443

444444
- *compute-cache-keys-step
445445
- *cache-build-dependencies-step

python/setup.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -432,14 +432,11 @@ def build_extension(self, ext):
432432
cmake_args += [
433433
"-DCMAKE_C_COMPILER=clang",
434434
"-DCMAKE_CXX_COMPILER=clang++",
435+
"-DCMAKE_LINKER=lld",
436+
"-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld",
437+
"-DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld",
438+
"-DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld",
435439
]
436-
if platform.system() != "Darwin":
437-
cmake_args += [
438-
"-DCMAKE_LINKER=lld",
439-
"-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld",
440-
"-DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld",
441-
"-DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld",
442-
]
443440

444441
# Note that asan doesn't work with binaries that use the GPU, so this is
445442
# only useful for tools like triton-opt that don't run code on the GPU.

0 commit comments

Comments
 (0)