Skip to content

Commit 19388de

Browse files
build: Add path for LLVM 15.0.7
1 parent 14a5323 commit 19388de

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ jobs:
2323
# https://github.com/github/roadmap/issues/528
2424
platform: ['ubuntu-20.04', 'macos-12'] # , 'windows-2022']
2525
config: ['dev', 'release']
26+
exclude:
27+
- platform: 'macos-12'
28+
config: 'dev'
29+
# Seeing an inexplicable
30+
# ld: file not found: external/llvm_toolchain_llvm/lib/clang/15.0.7/lib/darwin/libclang_rt.asan_osx_dynamic.dylib
31+
# when running in GitHub Actions
2632
runs-on: ${{ matrix.platform }}
2733
env:
2834
TAG: ${{ github.event.ref }}

settings.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
# Keep LLVM versions list in sync with setup_llvm.bzl
12
ASAN_LINKOPTS = [
23
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/15.0.6/lib/darwin",
4+
# macOS release builds use 15.0.7 for x86_64
5+
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/15.0.7/lib/darwin",
36
"-Wl,-rpath,@loader_path/../../../../../../external/llvm_toolchain_llvm/lib/clang/15.0.6/lib/linux",
47
]

setup_llvm.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
load("@com_grail_bazel_toolchain//toolchain:rules.bzl", grailbio_llvm_toolchain = "llvm_toolchain")
22

33
def setup_llvm_toolchain(name):
4+
# NOTE: The ASan build uses paths which involve the version.
5+
# Keep the version list in sync with settings.bzl
46
mapping = {
57
"linux-aarch64": {"version": "15.0.6", "triple": "aarch64-linux-gnu", "sha256": "8ca4d68cf103da8331ca3f35fe23d940c1b78fb7f0d4763c1c059e352f5d1bec"},
68
"linux-x86_64": {"version": "15.0.6", "triple": "x86_64-linux-gnu-ubuntu-18.04", "sha256": "38bc7f5563642e73e69ac5626724e206d6d539fbef653541b34cae0ba9c3f036"},

0 commit comments

Comments
 (0)