@@ -20,14 +20,14 @@ using `nixpkgs_cc_configure(..., cc_lang = "cuda")` or similar.
20
20
* [nixpkgs_cc_configure](#nixpkgs_cc_configure)
21
21
"""
22
22
23
+ load ("@bazel_skylib//lib:sets.bzl" , "sets" )
23
24
load ("@bazel_tools//tools/build_defs/repo:utils.bzl" , "maybe" )
24
25
load (
25
26
"@bazel_tools//tools/cpp:lib_cc_configure.bzl" ,
26
27
"get_cpu_value" ,
27
28
"get_starlark_list" ,
28
29
"write_builtin_include_directory_paths" ,
29
30
)
30
- load ("@bazel_skylib//lib:sets.bzl" , "sets" )
31
31
load ("@rules_nixpkgs_core//:nixpkgs.bzl" , "nixpkgs_package" )
32
32
load (
33
33
"@rules_nixpkgs_core//:util.bzl" ,
@@ -78,6 +78,7 @@ def _parse_cc_toolchain_info(content, filename):
78
78
"COVERAGE_COMPILE_FLAGS" ,
79
79
"COVERAGE_LINK_FLAGS" ,
80
80
"SUPPORTS_START_END_LIB" ,
81
+ "EXTRA_FLAGS_PER_FEATURE" ,
81
82
"IS_CLANG" ,
82
83
"CONLY_FLAGS" ,
83
84
])
@@ -118,6 +119,7 @@ def _parse_cc_toolchain_info(content, filename):
118
119
coverage_compile_flags = info ["COVERAGE_COMPILE_FLAGS" ],
119
120
coverage_link_flags = info ["COVERAGE_LINK_FLAGS" ],
120
121
supports_start_end_lib = info ["SUPPORTS_START_END_LIB" ] == ["True" ],
122
+ extra_flags_per_feature = info ["EXTRA_FLAGS_PER_FEATURE" ],
121
123
is_clang = info ["IS_CLANG" ] == ["True" ],
122
124
conly_flags = info ["CONLY_FLAGS" ],
123
125
)
@@ -219,6 +221,7 @@ def _nixpkgs_cc_toolchain_config_impl(repository_ctx):
219
221
"%{coverage_compile_flags}" : get_starlark_list (info .coverage_compile_flags ),
220
222
"%{coverage_link_flags}" : get_starlark_list (info .coverage_link_flags ),
221
223
"%{supports_start_end_lib}" : repr (info .supports_start_end_lib ),
224
+ "%{extra_flags_per_feature}" : repr (info .extra_flags_per_feature ),
222
225
"%{conly_flags}" : get_starlark_list (info .conly_flags ),
223
226
},
224
227
)
0 commit comments