Skip to content

Commit a11818b

Browse files
authored
Merge pull request #575 from hofbi/add_extra_flags_per_feature
Add extra_flags_per_feature to cc toolchain
2 parents c061458 + 0d7f271 commit a11818b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

toolchains/cc/cc.bzl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ using `nixpkgs_cc_configure(..., cc_lang = "cuda")` or similar.
2020
* [nixpkgs_cc_configure](#nixpkgs_cc_configure)
2121
"""
2222

23+
load("@bazel_skylib//lib:sets.bzl", "sets")
2324
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
2425
load(
2526
"@bazel_tools//tools/cpp:lib_cc_configure.bzl",
2627
"get_cpu_value",
2728
"get_starlark_list",
2829
"write_builtin_include_directory_paths",
2930
)
30-
load("@bazel_skylib//lib:sets.bzl", "sets")
3131
load("@rules_nixpkgs_core//:nixpkgs.bzl", "nixpkgs_package")
3232
load(
3333
"@rules_nixpkgs_core//:util.bzl",
@@ -78,6 +78,7 @@ def _parse_cc_toolchain_info(content, filename):
7878
"COVERAGE_COMPILE_FLAGS",
7979
"COVERAGE_LINK_FLAGS",
8080
"SUPPORTS_START_END_LIB",
81+
"EXTRA_FLAGS_PER_FEATURE",
8182
"IS_CLANG",
8283
"CONLY_FLAGS",
8384
])
@@ -118,6 +119,7 @@ def _parse_cc_toolchain_info(content, filename):
118119
coverage_compile_flags = info["COVERAGE_COMPILE_FLAGS"],
119120
coverage_link_flags = info["COVERAGE_LINK_FLAGS"],
120121
supports_start_end_lib = info["SUPPORTS_START_END_LIB"] == ["True"],
122+
extra_flags_per_feature = info["EXTRA_FLAGS_PER_FEATURE"],
121123
is_clang = info["IS_CLANG"] == ["True"],
122124
conly_flags = info["CONLY_FLAGS"],
123125
)
@@ -219,6 +221,7 @@ def _nixpkgs_cc_toolchain_config_impl(repository_ctx):
219221
"%{coverage_compile_flags}": get_starlark_list(info.coverage_compile_flags),
220222
"%{coverage_link_flags}": get_starlark_list(info.coverage_link_flags),
221223
"%{supports_start_end_lib}": repr(info.supports_start_end_lib),
224+
"%{extra_flags_per_feature}": repr(info.extra_flags_per_feature),
222225
"%{conly_flags}": get_starlark_list(info.conly_flags),
223226
},
224227
)

toolchains/cc/cc.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ pkgs.runCommand "bazel-${cc.orignalName or cc.name}-toolchain"
298298
if [[ -x ${cc}/bin/ld.gold ]]; then echo True; else echo False; fi
299299
)
300300
)
301+
EXTRA_FLAGS_PER_FEATURE=()
301302
IS_CLANG=(
302303
${if cc.isClang then "True" else "False"}
303304
)
@@ -332,6 +333,7 @@ pkgs.runCommand "bazel-${cc.orignalName or cc.name}-toolchain"
332333
write_info COVERAGE_COMPILE_FLAGS
333334
write_info COVERAGE_LINK_FLAGS
334335
write_info SUPPORTS_START_END_LIB
336+
write_info EXTRA_FLAGS_PER_FEATURE
335337
write_info IS_CLANG
336338
write_info CONLY_FLAGS
337339
''

0 commit comments

Comments
 (0)