diff options
| author | Fabian Meumertzheim <fabian@meumertzhe.im> | 2021-12-07 12:18:21 +0100 |
|---|---|---|
| committer | Fabian Meumertzheim <fabian@meumertzhe.im> | 2021-12-07 15:28:21 +0100 |
| commit | 4a482c7d2e31388197455d45801ed4602407ed0c (patch) | |
| tree | ca1837bc340ad09d1279d0428619c2d4a46f3ce9 /third_party | |
| parent | 5f7dfcb3dcf577a9a9c031909271d8b4a61106fb (diff) | |
| download | jazzer-api-4a482c7d2e31388197455d45801ed4602407ed0c.tar.gz | |
Update bazel_toolchain
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/bazel-toolchain-export-dynamic-macos-asan.patch | 23 | ||||
| -rw-r--r-- | third_party/bazel-toolchain-support-ubuntu-21.patch | 13 |
2 files changed, 7 insertions, 29 deletions
diff --git a/third_party/bazel-toolchain-export-dynamic-macos-asan.patch b/third_party/bazel-toolchain-export-dynamic-macos-asan.patch index ccbd79b0..05d300e8 100644 --- a/third_party/bazel-toolchain-export-dynamic-macos-asan.patch +++ b/third_party/bazel-toolchain-export-dynamic-macos-asan.patch @@ -1,21 +1,12 @@ -diff --git toolchain/BUILD.tpl toolchain/BUILD.tpl -index bc9280f..f4bfa3d 100644 ---- toolchain/BUILD.tpl -+++ toolchain/BUILD.tpl -@@ -126,6 +126,7 @@ filegroup( - [ - "lib/lib*.a", - "lib/clang/%{llvm_version}/lib/**/*.a", -+ "lib/clang/%{llvm_version}/lib/**/*.dylib", - ], - exclude = [ - "lib/libLLVM*.a", -@@ -216,3 +217,8 @@ filegroup( - ":linker_components", - ], +diff --git toolchain/BUILD.llvm_repo toolchain/BUILD.llvm_repo +--- toolchain/BUILD.llvm_repo ++++ toolchain/BUILD.llvm_repo +@@ -124,3 +124,8 @@ filegroup( + name = "strip", + srcs = ["bin/llvm-strip"], ) + +cc_import( + name = "macos_asan_dynamic", -+ shared_library = "lib/clang/%{llvm_version}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib", ++ shared_library = "lib/clang/12.0.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib", +) diff --git a/third_party/bazel-toolchain-support-ubuntu-21.patch b/third_party/bazel-toolchain-support-ubuntu-21.patch deleted file mode 100644 index b605cfc1..00000000 --- a/third_party/bazel-toolchain-support-ubuntu-21.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git toolchain/tools/llvm_release_name.py toolchain/tools/llvm_release_name.py -index 8ee544f..86f29f4 100755 ---- toolchain/tools/llvm_release_name.py -+++ toolchain/tools/llvm_release_name.py -@@ -77,7 +77,7 @@ def _linux(llvm_version): - os_name = "linux-sles%s" % version - elif distname == "ubuntu" and version.startswith("14.04"): - os_name = "linux-gnu-ubuntu-14.04" -- elif (distname == "ubuntu" and version.startswith("20.04")) or (distname == "linuxmint" and version.startswith("20")): -+ elif (distname == "ubuntu" and version.startswith("2")) or (distname == "linuxmint" and version.startswith("20")): - if major_llvm_version < 11: - # There is no binary packages specifically for 20.04, but those for 18.04 works on - # 20.04 |