Skip to content

Commit

Permalink
Use llvm@15 linker/ar/nm
Browse files Browse the repository at this point in the history
  • Loading branch information
fighet-parnet committed Jul 18, 2023
1 parent aca5410 commit 6fe5409
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bazel/toolchain/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ cc_toolchain_config(
# NOTE: building with `libtool` does not work on macOS due to lack of
# support in the `configure_make` rule provided by `rules_foreign_cc`.
# Therefore, we require setting `ar` as the archiver tool on macOS.
ar = "/usr/bin/ar",
ar = "/usr/local/opt/llvm@15/bin/llvm-ar",
# By default, Bazel passes the `rcsD` flags to `ar`, but macOS's `ar`
# implementation doesn't support `D`. We remove it with this attribute
# and corresponding `ar_flags_feature` in `cfg.bzl`.
Expand All @@ -288,7 +288,8 @@ cc_toolchain_config(
cc = "/usr/local/opt/llvm@15/bin/clang",
compiler = "clang",
compiler_version = "//:clang_version",
ld = "/usr/bin/ld",
ld = "/usr/local/opt/llvm@15/bin/llvm-lld",
nm = "/usr/local/opt/llvm@15/bin/llvm-nm",
sys_includes = [
"/usr/local/Cellar/llvm@15/15.0.7/lib/clang/15.0.7/include",
"/Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/usr/include",
Expand Down

0 comments on commit 6fe5409

Please sign in to comment.