mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:00:12 +01:00
Chandler CarruthandGeoff Romer
3603ec7d54
This moves the simplest parts of the toolchain config into separate files. These parts are either unparameterized or trivially parameterized and so easily extracted from the main file. I tried to minimize the interesting edits here, but wasn't _completely_ successful I'm afraid. I'll try to describe them. First, all of the interesting content of the new files is copied and re-indented, no interesting edits were done. The main file sees some more significant edits in order to realize this refactoring: - Extract the feature array building to a helper method. - Collapse some extraneous features as there was no where to extract them. - Restructure how the array itself is built to support building it using array fragments from the various files. The only interesting semantic change I'm aware of here is that this somewhat changes the order of command line flags in compiles and links. The previous order was "fine", but not especially logical. I've tried to more logically have features that should "override" or are "more specific" come later here. However, that results in a slightly different ordering. None of the current features had any flags that overlap, so this should have no behavior change other than the changed flag order. This is only the first step, however. There remain complex features in the main configuration that I want to move out. However, to make those moves simple requires some significant changes to how these remaining features work and so I wanted to break them out. I've tried to leave TODOs that can help as breadcrumbs on the parts of this refactoring that aren't yet complete. The comments also are mostly what we already had. I'm happy to try and add some, but not sure how much I can cover as there is a _lot_ of code here that I'm just moving around. Please let me know if there are particularly places that would benefit from comments. --------- Co-authored-by: Geoff Romer <gromer@google.com>
83 lines
2.4 KiB
Python
83 lines
2.4 KiB
Python
# 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
|
|
|
|
"""Definitions of C++ and Clang header modules toolchain features."""
|
|
|
|
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",
|
|
)
|
|
|
|
use_module_maps = feature(
|
|
name = "use_module_maps",
|
|
requires = [feature_set(features = ["module_maps"])],
|
|
flag_sets = [
|
|
flag_set(
|
|
actions = [
|
|
ACTION_NAMES.c_compile,
|
|
ACTION_NAMES.cpp_compile,
|
|
ACTION_NAMES.cpp_header_parsing,
|
|
ACTION_NAMES.cpp_module_compile,
|
|
],
|
|
flag_groups = [
|
|
# These flag groups are separate so they do not expand to
|
|
# the cross product of the variables.
|
|
flag_group(flags = ["-fmodule-name=%{module_name}"]),
|
|
flag_group(
|
|
flags = ["-fmodule-map-file=%{module_map_file}"],
|
|
),
|
|
],
|
|
),
|
|
],
|
|
)
|
|
|
|
# Tell bazel we support module maps in general, so they will be generated
|
|
# for all c/c++ rules.
|
|
# Note: not all C++ rules support module maps; thus, do not imply this
|
|
# feature from other features - instead, require it.
|
|
module_maps = feature(
|
|
name = "module_maps",
|
|
enabled = True,
|
|
implies = [
|
|
# "module_map_home_cwd",
|
|
# "module_map_without_extern_module",
|
|
# "generate_submodules",
|
|
],
|
|
)
|
|
|
|
layering_check = feature(
|
|
name = "layering_check",
|
|
implies = ["use_module_maps"],
|
|
flag_sets = [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 = [
|
|
"-fmodules-strict-decluse",
|
|
"-Wprivate-header",
|
|
]),
|
|
flag_group(
|
|
iterate_over = "dependent_module_map_files",
|
|
flags = ["-fmodule-map-file=%{dependent_module_map_files}"],
|
|
),
|
|
],
|
|
)],
|
|
)
|
|
|
|
# Note that the order of features is significant in this list and determines the
|
|
# relative order of flags from the features listed.
|
|
modules_features = [
|
|
layering_check,
|
|
module_maps,
|
|
use_module_maps,
|
|
]
|