motiejus
/
hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

Move -Wl,-S to a separate strip_debug_symbols feature

This commit is contained in:
Jeremy Volkman 2023-04-25 15:52:55 -07:00 committed by Motiejus Jakštys
parent 46289440a3
commit 5a7e58af4e
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
toolchain/zig_toolchain.bzl
View File

@ -69,6 +69,7 @@ def _compilation_mode_features(ctx):
], ],
) )
# fastbuild also gets the strip_debug_symbols flags by default.
fastbuild_feature = feature( fastbuild_feature = feature(
name = "fastbuild", name = "fastbuild",
flag_sets = [ flag_sets = [
@ -76,7 +77,7 @@ def _compilation_mode_features(ctx):
actions = actions, actions = actions,
flag_groups = [ flag_groups = [
flag_group( flag_group(
flags = ["-fno-lto", "-Wl,-S"], flags = ["-fno-lto"],
), ),
], ],
), ),
@ -117,20 +118,20 @@ def _zig_cc_toolchain_config_impl(ctx):
link_flag_sets = [] link_flag_sets = []
if ctx.attr.linkopts: if ctx.attr.linkopts:
link_flag_sets += [ link_flag_sets.append(
flag_set( flag_set(
actions = all_link_actions, actions = all_link_actions,
flag_groups = [flag_group(flags = ctx.attr.linkopts)], flag_groups = [flag_group(flags = ctx.attr.linkopts)],
), )
] )
if ctx.attr.dynamic_library_linkopts: if ctx.attr.dynamic_library_linkopts:
link_flag_sets += [ link_flag_sets.append(
flag_set( flag_set(
actions = dynamic_library_link_actions, actions = dynamic_library_link_actions,
flag_groups = [flag_group(flags = ctx.attr.dynamic_library_linkopts)], flag_groups = [flag_group(flags = ctx.attr.dynamic_library_linkopts)],
), )
] )
default_linker_flags = feature( default_linker_flags = feature(
name = "default_linker_flags", name = "default_linker_flags",
@ -143,10 +144,26 @@ def _zig_cc_toolchain_config_impl(ctx):
enabled = True, enabled = True,
) )
strip_debug_symbols_feature = feature(
name = "strip_debug_symbols",
flag_sets = [
flag_set(
actions = all_link_actions,
flag_groups = [
flag_group(
flags = ["-Wl,-S"],
expand_if_available = "strip_debug_symbols",
),
],
),
],
)
features = [ features = [
compile_and_link_flags, compile_and_link_flags,
default_linker_flags, default_linker_flags,
supports_dynamic_linker, supports_dynamic_linker,
strip_debug_symbols_feature,
] + _compilation_mode_features(ctx) ] + _compilation_mode_features(ctx)
artifact_name_patterns = [ artifact_name_patterns = [