carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 09:24:46 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Move our project-specific features to their own file (#6614)

Browse Source 
Also tidies up how we inject the project features so that they come last
and can override anything earlier.
This commit is contained in:
Chandler Carruth
2026-01-16 20:47:50 +00:00
committed by GitHub
parent 95eb7b16bb
commit 83aeddb5ec
4 changed files with 94 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MODULE.bazel.lock
Generated
+1 -1
View File
@@ -252,7 +252,7 @@
"moduleExtensions": {
"//bazel/cc_toolchains:clang_configuration.bzl%clang_toolchain_extension": {
"general": {
"bzlTransitiveDigest": "MPw4EBs6afpwX0Xv1R3PmUjuOSQXbf9hi5tMqHjYz+M=",
"bzlTransitiveDigest": "owIfgyIggWlM+ycSaq7Niq1Qiq8J0/TlPl8w79qPBgY=",
"usagesDigest": "lTxkeAFhR0iBEa3dg5hWvtd2HFCr5zCJx/fl27A+IKA=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
bazel/cc_toolchains/cc_toolchain_carbon_project_features.bzl
+84
View File
@@ -0,0 +1,84 @@
# Part of the Carbon Language project, under the Apache License v2.0 with LLVM
# Exceptions. See /LICENSE for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
"""Defines `cc_toolchain_config` features specific to the Carbon project."""
load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES")
load(
"@rules_cc//cc:cc_toolchain_config_lib.bzl",
"feature",
"feature_set",
"flag_group",
"flag_set",
"with_feature_set",
)
load(
":cc_toolchain_actions.bzl",
"all_compile_actions",
"preprocessor_compile_actions",
)
# An enabled feature that requires the `fastbuild` compilation. This is used
# to toggle general features on by default, while allowing them to be
# directly enabled and disabled more generally as desired.
carbon_project_fastbuild_feature = feature(
name = "enable_in_fastbuild",
enabled = True,
requires = [feature_set(["fastbuild"])],
implies = [
"asan",
"asan_min_size",
"minimal_optimization_flags",
"minimal_debug_info_flags",
],
)
def carbon_project_features(cache_key):
return [carbon_project_fastbuild_feature, feature(
name = "project_flags",
enabled = True,
flag_sets = [
flag_set(
actions = all_compile_actions,
flag_groups = [flag_group(flags = [
# Don't warn on external code as we can't
# necessarily patch it easily. Note that these have
# to be initial directories in the `#include` line.
"--system-header-prefix=absl/",
"--system-header-prefix=benchmark/",
"--system-header-prefix=boost/",
"--system-header-prefix=clang-tools-extra/",
"--system-header-prefix=clang/",
"--system-header-prefix=gmock/",
"--system-header-prefix=gtest/",
"--system-header-prefix=libfuzzer/",
"--system-header-prefix=llvm/",
"--system-header-prefix=re2/",
"--system-header-prefix=tools/cpp/",
"--system-header-prefix=tree_sitter/",
])],
),
flag_set(
actions = preprocessor_compile_actions,
flag_groups = [flag_group(flags = [
# Pass a cache key as a `-D` flag to avoid unintended Bazel
# cache hits when the underlying toolchain changes.
# TODO: We should consider replacing this by causing changes
# to the installed toolchain to more reliably end up as part
# of the action digest.
"-DBAZEL_COMPILE_CACHE_KEY=\"%s\"" % cache_key,
])],
),
flag_set(
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
],
flag_groups = [flag_group(flags = ["-DHAVE_MALLCTL"])],
with_features = [with_feature_set(["freebsd_target"])],
),
],
)]
bazel/cc_toolchains/clang_cc_toolchain_config.bzl
+8 -85
View File
@@ -4,28 +4,15 @@
"""A Starlark cc_toolchain configuration rule"""
load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES")
load(
"@rules_cc//cc:cc_toolchain_config_lib.bzl",
"feature",
"feature_set",
"flag_group",
"flag_set",
"with_feature_set",
)
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load(
":cc_toolchain_actions.bzl",
"all_compile_actions",
"preprocessor_compile_actions",
)
load(
":cc_toolchain_base_features.bzl",
"base_features",
"output_flags_feature",
"user_flags_feature",
)
load(":cc_toolchain_carbon_project_features.bzl", "carbon_project_features")
load(
":cc_toolchain_config_features.bzl",
"target_cpu_features",
@@ -58,66 +45,6 @@ load(
)
def _build_features(ctx):
project_flags_feature = feature(
name = "project_flags",
enabled = True,
flag_sets = [
flag_set(
actions = all_compile_actions,
flag_groups = [flag_group(flags = [
# Don't warn on external code as we can't
# necessarily patch it easily. Note that these have
# to be initial directories in the `#include` line.
"--system-header-prefix=absl/",
"--system-header-prefix=benchmark/",
"--system-header-prefix=boost/",
"--system-header-prefix=clang-tools-extra/",
"--system-header-prefix=clang/",
"--system-header-prefix=gmock/",
"--system-header-prefix=gtest/",
"--system-header-prefix=libfuzzer/",
"--system-header-prefix=llvm/",
"--system-header-prefix=re2/",
"--system-header-prefix=tools/cpp/",
"--system-header-prefix=tree_sitter/",
])],
),
flag_set(
actions = preprocessor_compile_actions,
flag_groups = [flag_group(flags = [
# Pass the Clang version to get better Bazel caching
# behavior with system-installed Clang binaries.
"-DCLANG_VERSION_FOR_CACHE=\"%s\"" % clang_version_for_cache,
])],
),
flag_set(
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
],
flag_groups = [flag_group(flags = ["-DHAVE_MALLCTL"])],
with_features = [with_feature_set(["freebsd_target"])],
),
],
)
# An enabled feature that requires the `fastbuild` compilation. This is used
# to toggle general features on by default, while allowing them to be
# directly enabled and disabled more generally as desired.
enable_in_fastbuild = feature(
name = "enable_in_fastbuild",
enabled = True,
requires = [feature_set(["fastbuild"])],
implies = [
"asan",
"asan_min_size",
"minimal_optimization_flags",
"minimal_debug_info_flags",
],
)
# The order of the features determines the relative order of flags used.
features = []
features += target_os_features(ctx.attr.target_os)
@@ -129,10 +56,6 @@ def _build_features(ctx):
clang_warnings_feature,
# Enable libc++ where supported.
libcxx_feature(llvm_bindir, clang_bindir),
# Include any project-specific flags, importantly after the Clang and
# warnings features so we can override as necessary here.
project_flags_feature,
]
features += sanitizer_features
features += optimization_features
@@ -140,13 +63,13 @@ def _build_features(ctx):
features += debugging_features
features += linking_features
# Lastly, we add a feature that enables others in the default `fastbuild`
# mode. This is also a good place to add any project-specific features.
features.append(enable_in_fastbuild)
# Add user flags and the output flags at the end.
features.append(user_flags_feature)
features.append(output_flags_feature)
# Lastly, we add project features and the user flags so they can override
# anything above, and the output flags last of all for ease of debugging.
features += carbon_project_features(clang_version_for_cache)
features += [
user_flags_feature,
output_flags_feature,
]
return features
def _impl(ctx):
bazel/cc_toolchains/clang_configuration.bzl
+1
View File
@@ -264,6 +264,7 @@ configure_clang_toolchain = repository_rule(
default = [
Label("//bazel/cc_toolchains:cc_toolchain_actions.bzl"),
Label("//bazel/cc_toolchains:cc_toolchain_base_features.bzl"),
Label("//bazel/cc_toolchains:cc_toolchain_carbon_project_features.bzl"),
Label("//bazel/cc_toolchains:cc_toolchain_config_features.bzl"),
Label("//bazel/cc_toolchains:cc_toolchain_cpp_features.bzl"),
Label("//bazel/cc_toolchains:cc_toolchain_debugging.bzl"),