Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .aspect/workflows/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tasks:
- type: before_task
command: |
rm .bazelversion
echo "USE_BAZEL_VERSION=8.4.0" > .bazeliskrc
echo "USE_BAZEL_VERSION=8.5.0" > .bazeliskrc

- finalization:
queue: aspect-small
Expand Down
15 changes: 5 additions & 10 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import %workspace%/bazel/defaults.bazelrc

common --enable_bzlmod

common --test_output=errors
common --incompatible_disallow_empty_glob=False

# Define value used by tests
common --define=SOME_VAR=SOME_VALUE
Expand All @@ -11,16 +10,16 @@ common --define=SOME_VAR=SOME_VALUE
common --@pypi//venv=default

common --incompatible_enable_cc_toolchain_resolution
common --@toolchains_llvm_bootstrapped//config:experimental_stub_libgcc_s
common --@rules_cc//cc/toolchains/args/archiver_flags:use_libtool_on_macos=false

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

# Don't try and auto detect the cc toolchain, as we use our own gcc toolchains.
# Don't try and auto detect the cc toolchain, as we use our own llvm toolchains.
common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1

# Don't link against libunwind on macos as it causes linking failures (https://github.com/bazel-contrib/toolchains_llvm/pull/346)
common:macos --@toolchains_llvm//toolchain/config:libunwind=False
common --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1

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

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

# Speed up local development by using the non-hermetic CPP toolchain.
common:nollvm --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=0
common:nollvm --noincompatible_enable_cc_toolchain_resolution

# Load any settings specific to the current user.
# .bazelrc.user should appear in .gitignore so that settings are not shared with team members
# This needs to be last statement in this
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
8.4.0
8.5.0
# The first line of this file is used by Bazelisk and Bazel to be sure
# the right version of Bazel is used to build and test this repo.
# This also defines which version is used on CI.
Expand Down
Loading
Loading