Skip to content

Commit a66f1ce

Browse files
committed
WIP: Use bootstrapped llvm toolchain
1 parent ff8e27f commit a66f1ce

File tree

11 files changed

+119
-713
lines changed

11 files changed

+119
-713
lines changed

.bazelrc

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

3-
common --enable_bzlmod
4-
53
common --test_output=errors
4+
common --incompatible_disallow_empty_glob=False
5+
6+
# TODO(zbarsky): we shouldn't need this...
7+
# common --nocheck_visibility
68

79
# Define value used by tests
810
common --define=SOME_VAR=SOME_VALUE
@@ -11,16 +13,16 @@ common --define=SOME_VAR=SOME_VALUE
1113
common --@pypi//venv=default
1214

1315
common --incompatible_enable_cc_toolchain_resolution
16+
common --@toolchains_llvm_bootstrapped//config:experimental_stub_libgcc_s
17+
common --@rules_cc//cc/toolchains/args/archiver_flags:use_libtool_on_macos=false
1418

1519
# TODO(bzlmod): Don't break proto
1620
common --per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
1721
common --host_per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
1822

19-
# Don't try and auto detect the cc toolchain, as we use our own gcc toolchains.
23+
# Don't try and auto detect the cc toolchain, as we use our own llvm toolchains.
2024
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
25+
common --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
2426

2527
common:ci --toolchain_resolution_debug='@@bazel_tools//tools/cpp:toolchain_type'
2628

@@ -30,10 +32,6 @@ common:release --compilation_mode=opt
3032
common:release --@rules_rust//rust/settings:lto=fat
3133
common:release --@rules_rust//:extra_rustc_flags=-Cpanic=abort
3234

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-
3735
# Load any settings specific to the current user.
3836
# .bazelrc.user should appear in .gitignore so that settings are not shared with team members
3937
# This needs to be last statement in this

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
8.4.0
1+
8.5.0rc4
22
# The first line of this file is used by Bazelisk and Bazel to be sure
33
# the right version of Bazel is used to build and test this repo.
44
# This also defines which version is used on CI.

0 commit comments

Comments
 (0)