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

Jump to bottom

fix: use resource directory for clang #27

Merged
merged 1 commit into from
Jan 1, 2024
Merged

fix: use resource directory for clang #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 22 additions & 5 deletions cpp/private/actions/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,23 @@ load("//cpp/private:extra_actions.bzl", "EXTRA_ACTIONS")
def _cpp_compile_impl(ctx, sources, headers, includes, modules, features, toolchain, module_srcs = []):
obj_files = []

compiler = cc_common.get_tool_for_action(
feature_configuration = features,
action_name = ACTION_NAMES.cpp_compile,
)

config = ctx.actions.declare_file(ctx.label.name + ".config")

ctx.actions.run_shell(
outputs = [config],
inputs = toolchain.all_files,
arguments = [config.path],
command = "echo \"-resource-dir=$({compiler} -print-resource-dir)\" > $1 || touch $1".format(compiler = compiler),
)

extra_vars = {
"cpp_precompiled_modules": [],
"clang_config_file": config.path,
}

module_files = []
Expand All @@ -23,14 +38,15 @@ def _cpp_compile_impl(ctx, sources, headers, includes, modules, features, toolch

extra_vars["cpp_precompiled_modules"] = module_vars

compiler = cc_common.get_tool_for_action(
feature_configuration = features,
action_name = ACTION_NAMES.cpp_compile,
)

for src in sources:
action_name = ACTION_NAMES.cpp_compile
if src.extension in ["pcm"]:
action_name = EXTRA_ACTIONS.cpp_module_compile
compiler = cc_common.get_tool_for_action(
feature_configuration = features,
action_name = action_name,
)

outfile = ctx.actions.declare_file("_objs/" + ctx.label.name + "/" + src.basename + ".o")
args = get_compile_command_args(
Expand All @@ -40,11 +56,12 @@ def _cpp_compile_impl(ctx, sources, headers, includes, modules, features, toolch
features = features,
include_directories = includes,
extra_vars = extra_vars,
action_name = action_name,
)

ctx.actions.run(
outputs = [outfile],
inputs = depset([src], transitive = [depset(headers), depset(module_files), toolchain.all_files, depset(module_srcs)]),
inputs = depset([src, config], transitive = [depset(headers), depset(module_files), toolchain.all_files, depset(module_srcs)]),
executable = compiler,
arguments = args,
mnemonic = "CppCompile",
Expand Down
9 changes: 6 additions & 3 deletions cpp/private/extra_actions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")

CPP_MODULE_INTEFACE = "cpp20-module-interface"
CPP_MODULE_COMPILE = "cpp20-module-compile"
CPP_MODULE_INTEFACE = "c++20-module-interface"
CPP_MODULE_COMPILE = "c++20-module-compile"

EXTRA_ACTIONS = struct(
cpp_module_precompile_interface = CPP_MODULE_INTEFACE,
Expand All @@ -14,12 +14,15 @@ all_c_compile_actions = [
ACTION_NAMES.preprocess_assemble,
]

all_cpp_compile_actions = [
all_cpp_classic_compile_actions = [
ACTION_NAMES.cpp_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
]

all_cpp_compile_actions = all_cpp_classic_compile_actions + [
EXTRA_ACTIONS.cpp_module_compile,
]

Expand Down
37 changes: 20 additions & 17 deletions cpp/private/toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,9 @@ load(
load("//cpp/private:utils.bzl", "is_clang", "is_libcpp", "is_lld", "is_llvm")
load("//cpp/private:tool.bzl", "ToolInfo")

def _get_include_paths(stdlib, compiler):
include_dirs = []
stdlib_base = stdlib.label.workspace_root + "/"
compiler_base = compiler.dirname + "/../"
if is_libcpp(stdlib):
include_dirs += [
stdlib_base + "include/c++/v1",
stdlib_base + "include/x86_64-unknown-linux-gnu",
stdlib_base + "include/x86_64-unknown-linux-gnu/c++/v1",
]

if is_clang(compiler):
include_dirs.append(
compiler_base + "lib/clang/17/include",
)

return include_dirs
def _get_include_paths(_stdlib, _compiler):
# FIXME support different combinations
return []

def _get_link_paths(stdlib, compiler):
stdlib_base = stdlib.label.workspace_root + "/"
Expand Down Expand Up @@ -173,6 +159,22 @@ def _get_clang_features(ctx):
],
)

clang_default_flags = feature(
name = "clang_default_flags",
enabled = True,
flag_sets = [
flag_set(
actions = all_compile_actions + [EXTRA_ACTIONS.cpp_module_precompile_interface],
flag_groups = [
flag_group(
expand_if_available = "clang_config_file",
flags = ["--config=%{clang_config_file}"],
),
],
),
],
)

use_modules = feature(
name = "c++20_modules",
flag_sets = [
Expand Down Expand Up @@ -220,6 +222,7 @@ def _get_clang_features(ctx):
module_interface_precompile_feature,
lld_feature,
use_modules,
clang_default_flags,
]

def _get_action_configs(compiler, strip, archiver):
Expand Down
11 changes: 3 additions & 8 deletions cpp/private/unix_toolchain_features.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ load(
"EXTRA_ACTIONS",
"all_c_compile_actions",
"all_compile_actions",
"all_cpp_classic_compile_actions",
"all_cpp_compile_actions",
"all_link_actions",
"codegen_compile_actions",
Expand All @@ -25,21 +26,15 @@ def get_default_flags(std_compile_flags, include_dirs, link_dirs, exec_rpath_pre
enabled = True,
flag_sets = [
flag_set(
actions = all_cpp_compile_actions + all_link_actions + [EXTRA_ACTIONS.cpp_module_precompile_interface],
actions = all_cpp_classic_compile_actions + all_link_actions + [EXTRA_ACTIONS.cpp_module_precompile_interface],
flag_groups = ([
flag_group(
flags = std_compile_flags,
),
]),
),
flag_set(
actions = all_c_compile_actions + [
ACTION_NAMES.cpp_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
],
actions = all_c_compile_actions + all_cpp_classic_compile_actions,
flag_groups = [
flag_group(
flags = ["-isystem" + x for x in include_dirs] + [
Expand Down