Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Update to Bazel 7 #788

Merged
merged 4 commits into from
Dec 13, 2023
Merged

build: Update to Bazel 7 #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c9d87f
deps/icu: Fix Windows build w/ Bazel 7
robinlinden Dec 11, 2023
b5b76b9
build: Add link-time workaround for aarch64 cross-compilation w/ Bazel 7
robinlinden Dec 13, 2023
bf78314
build: Use apple_support to configure the objc toolchain
robinlinden Dec 13, 2023
65d2d1c
build: Update to Bazel 7
robinlinden Dec 11, 2023
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
9 changes: 8 additions & 1 deletion .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ test --test_verbose_timeout_warnings

build --incompatible_config_setting_private_default_visibility
build --incompatible_disallow_empty_glob
build --incompatible_enable_cc_toolchain_resolution
build --incompatible_enforce_config_setting_visibility

# Compiler configuration
Expand All @@ -29,6 +28,9 @@ build:linux --features=layering_check
build:linux --cxxopt='-std=c++2b'
build:linux --cxxopt='-fno-rtti'

build:macos --apple_crosstool_top=@local_config_apple_cc//:toolchain
build:macos --crosstool_top=@local_config_apple_cc//:toolchain
build:macos --host_crosstool_top=@local_config_apple_cc//:toolchain
build:macos --features=layering_check
build:macos --cxxopt='-std=c++2b'
build:macos --cxxopt='-fno-rtti'
Expand Down Expand Up @@ -104,6 +106,11 @@ build:linux-aarch64-musl --copt=-fPIC
build:linux-aarch64-musl --dynamic_mode=off
# TODO(robinlinden): asio assumes __GLIBC__ is defined.
build:linux-aarch64-musl --copt=-Wno-error=undef
# --incompatible_sandbox_hermetic_tmp (defaults to true in Bazel 7) leads to
# incredibly long link times.
# See: https://github.com/uber/hermetic_cc_toolchain/issues/134
build:linux-aarch64-musl --noincompatible_sandbox_hermetic_tmp


# Fuzzing options
# =========================================================
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.0
7.0.0
12 changes: 12 additions & 0 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Bazel
# =========================================================

# https://github.com/bazelbuild/apple_support
http_archive(
name = "build_bazel_apple_support",
sha256 = "cf4d63f39c7ba9059f70e995bf5fe1019267d3f77379c2028561a5d7645ef67c",
url = "https://github.com/bazelbuild/apple_support/releases/download/1.11.1/apple_support.1.11.1.tar.gz",
)

# https://github.com/bazelbuild/platforms
http_archive(
name = "platforms", # Apache-2.0
Expand Down Expand Up @@ -308,6 +315,11 @@ http_archive(
# This needs to go last so that we can override any dependencies these calls may
# pull in.

# build_bazel_apple_support
load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")

apple_support_dependencies()

# rules_python
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

Expand Down
6 changes: 3 additions & 3 deletions third_party/icu.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ cc_library(
copts = select({
"@platforms//os:windows": [
"/GR",
"-I source/common/",
"-I source/common/unicode/",
"-I source/stubdata/",
"-Isource/common/",
"-Isource/common/unicode/",
"-Isource/stubdata/",
],
"//conditions:default": [
"-frtti",
Expand Down