Skip to content

add additional toolchain options #75

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

Merged
hexdae merged 3 commits into from
Aug 15, 2025
Merged

add additional toolchain options #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa19a5c
add additional toolchain options
oliverlee Jul 16, 2025
6f240bf
include std by default
oliverlee Jul 16, 2025
5012bfb
use `None` to propagate default values
oliverlee Jul 17, 2025
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 MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

136 changes: 115 additions & 21 deletions toolchain/config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,28 @@ def _additional_link_library_flags(ctx):

return flags

def _flag_groups_if_not_empty(flags, actual_flags = None):
if not flags:
return []
return [
flag_group(
flags = actual_flags or flags,
),
]

_all_compile_actions =[
ACTION_NAMES.assemble,
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
ACTION_NAMES.lto_backend,
ACTION_NAMES.clif_match,
]

def _impl(ctx):
default_compiler_flags = _default_compiler_flags(ctx)
default_linker_flags = _default_linker_flags(ctx)
Expand Down Expand Up @@ -100,27 +122,82 @@ def _impl(ctx):
"strip",
)

dbg_feature = feature(
name = "dbg",
flag_sets = [
flag_set(
actions = _all_compile_actions,
flag_groups = _flag_groups_if_not_empty(ctx.attr.dbg_compile_flags),
),
],
provides = ["compilation_mode"],
)

opt_feature = feature(
name = "opt",
flag_sets = [
flag_set(
actions = _all_compile_actions,
flag_groups = _flag_groups_if_not_empty(ctx.attr.opt_compile_flags),
),
flag_set(
actions = [ACTION_NAMES.cpp_link_executable],
flag_groups = _flag_groups_if_not_empty(ctx.attr.opt_link_flags),
),
],
provides = ["compilation_mode"],
)

fastbuild_feature = feature(
name = "fastbuild",
flag_sets = [
flag_set(
actions = _all_compile_actions,
flag_groups = [],
),
],
provides = ["compilation_mode"],
)

toolchain_compiler_flags = feature(
name = "compiler_flags",
enabled = True,
flag_sets = [
flag_set(
actions = _all_compile_actions,
flag_groups = [
flag_group(flags = ["-isystem " + include.path for include in ctx.files.include_path]),
flag_group(flags = ctx.attr.copts + default_compiler_flags),
],
),
],
)

cxx_flags = feature(
name = "cxx_flags",
enabled = True,
flag_sets = [
flag_set(
actions = [
ACTION_NAMES.assemble,
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
ACTION_NAMES.lto_backend,
ACTION_NAMES.clif_match,
],
flag_groups = [
flag_group(flags = ["-isystem" + include.path for include in ctx.files.include_path]),
flag_group(flags = ctx.attr.copts + default_compiler_flags),
flag_groups = _flag_groups_if_not_empty(ctx.attr.cxxopts),
),
],
)

conly_flags = feature(
name = "conly_flags",
enabled = True,
flag_sets = [
flag_set(
actions = [
ACTION_NAMES.c_compile,
],
flag_groups = _flag_groups_if_not_empty(ctx.attr.conlyopts),
),
],
)
Expand All @@ -141,30 +218,29 @@ def _impl(ctx):
],
)

additional_link_libraries = feature(
name = "additional_link_libraries",
custom_linkopts = feature(
name = "custom_linkopts",
enabled = True,
flag_sets = [
flag_set(
actions = [ACTION_NAMES.cpp_link_executable],
flag_groups = [
flag_group(
flags = _additional_link_library_flags(ctx),
),
] if ctx.attr.additional_link_libraries else [],
flag_group(flags = ctx.attr.linkopts + default_linker_flags),
],
),
],
)

custom_linkopts = feature(
name = "custom_linkopts",
additional_link_libraries = feature(
name = "additional_link_libraries",
enabled = True,
flag_sets = [
flag_set(
actions = [ACTION_NAMES.cpp_link_executable],
flag_groups = [
flag_group(flags = ctx.attr.linkopts + default_linker_flags),
],
flag_groups = _flag_groups_if_not_empty(
ctx.attr.additional_link_libraries,
_additional_link_library_flags(ctx),
),
),
],
)
Expand Down Expand Up @@ -204,8 +280,13 @@ def _impl(ctx):
for include in ctx.files.include_path
],
features = [
dbg_feature,
opt_feature,
fastbuild_feature,
generate_linkmap_feature,
toolchain_compiler_flags,
cxx_flags,
conly_flags,
toolchain_linker_flags,
additional_link_libraries,
custom_linkopts,
Expand All @@ -224,10 +305,23 @@ cc_arm_gnu_toolchain_config = rule(
"gcc_tool": attr.string(default = "gcc"),
"abi_version": attr.string(default = ""),
"copts": attr.string_list(default = []),
"cxxopts": attr.string_list(default = []),
"conlyopts": attr.string_list(default = []),
"linkopts": attr.string_list(default = []),
"include_path": attr.label_list(default = [], allow_files = True),
"library_path": attr.label_list(default = [], allow_files = True),
"include_std": attr.bool(default = False),
"include_std": attr.bool(default = True),
"dbg_compile_flags": attr.string_list(default = [
"-ggdb",
"-Og",
]),
"opt_compile_flags": attr.string_list(default = [
"-DNDEBUG",
"-O2",
]),
"opt_link_flags": attr.string_list(default = [
"-Wl,-S",
]),
"additional_link_libraries": attr.label_list(
providers = [CcInfo],
default = [],
Expand Down
12 changes: 11 additions & 1 deletion toolchain/templates/toolchain.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,15 @@ def %toolchain_name%_toolchain(
gcc_tool = "gcc",
abi_version = "",
copts = [],
cxxopts = [],
conlyopts = [],
linkopts = [],
dbg_compile_flags = None,
opt_compile_flags = None,
opt_link_flags = None,
target_compatible_with = [],
additional_link_libraries = [],
include_std = False,
include_std = True,
visibility = None,
):
"""
Expand Down Expand Up @@ -162,8 +167,13 @@ def %toolchain_name%_toolchain(
include_path = ["{}:include_path".format(alias_repo)],
library_path = ["{}:library_path".format(alias_repo)],
copts = copts + fix_copts,
cxxopts = cxxopts,
conlyopts = conlyopts,
linkopts = linkopts + fix_linkopts,
include_std = include_std,
dbg_compile_flags = dbg_compile_flags,
opt_compile_flags = opt_compile_flags,
opt_link_flags = opt_link_flags,
additional_link_libraries = variant.additional_link_libraries,
tags = ["manual"],
)
Expand Down
2 changes: 1 addition & 1 deletion toolchain/toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _arm_gnu_toolchain(
copts = [],
linkopts = [],
version = "",
include_std = False):
include_std = True):
for host, exec_compatible_with in hosts[toolchain_prefix].items():
fix_linkopts = []

Expand Down