Skip to content

Commit 11c7996

Browse files
committed
WIP: Use bootstrapped llvm toolchain
1 parent 11a04f3 commit 11c7996

File tree

10 files changed

+117
-1018
lines changed

10 files changed

+117
-1018
lines changed

.bazelrc

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import %workspace%/bazel/defaults.bazelrc
22

3-
common --enable_bzlmod
4-
53
common --test_output=errors
4+
common --incompatible_disallow_empty_glob=False
65

76
# Define value used by tests
87
common --define=SOME_VAR=SOME_VALUE
@@ -11,16 +10,16 @@ common --define=SOME_VAR=SOME_VALUE
1110
common --@pypi//venv=default
1211

1312
common --incompatible_enable_cc_toolchain_resolution
13+
common --@toolchains_llvm_bootstrapped//config:experimental_stub_libgcc_s
14+
common --@rules_cc//cc/toolchains/args/archiver_flags:use_libtool_on_macos=false
1415

1516
# TODO(bzlmod): Don't break proto
1617
common --per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
1718
common --host_per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
1819

19-
# Don't try and auto detect the cc toolchain, as we use our own gcc toolchains.
20+
# Don't try and auto detect the cc toolchain, as we use our own llvm toolchains.
2021
common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
21-
22-
# Don't link against libunwind on macos as it causes linking failures (https://github.com/bazel-contrib/toolchains_llvm/pull/346)
23-
common:macos --@toolchains_llvm//toolchain/config:libunwind=False
22+
common --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
2423

2524
common:ci --toolchain_resolution_debug='@@bazel_tools//tools/cpp:toolchain_type'
2625

@@ -30,10 +29,6 @@ common:release --compilation_mode=opt
3029
common:release --@rules_rust//rust/settings:lto=fat
3130
common:release --@rules_rust//:extra_rustc_flags=-Cpanic=abort
3231

33-
# Speed up local development by using the non-hermetic CPP toolchain.
34-
common:nollvm --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=0
35-
common:nollvm --noincompatible_enable_cc_toolchain_resolution
36-
3732
# Load any settings specific to the current user.
3833
# .bazelrc.user should appear in .gitignore so that settings are not shared with team members
3934
# This needs to be last statement in this

0 commit comments

Comments
 (0)