Merge pull request #466 from Silic0nS0ldier/cconly-flags

Stubs for new argument `conly_flags` in `cc_toolchain_config`
tweag · Dec 13, 2023 · 1ad0bd9 · 1ad0bd9
2 parents 8c6f509 + d93d061
commit 1ad0bd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/toolchains/cc/cc.bzl b/toolchains/cc/cc.bzl
@@ -79,6 +79,7 @@ def _parse_cc_toolchain_info(content, filename):
         "COVERAGE_LINK_FLAGS",
         "SUPPORTS_START_END_LIB",
         "IS_CLANG",
+        "CONLY_FLAGS",
     ])
     actual_keys = sets.make(info.keys())
     missing_keys = sets.difference(expected_keys, actual_keys)
@@ -118,6 +119,7 @@ def _parse_cc_toolchain_info(content, filename):
         coverage_link_flags = info["COVERAGE_LINK_FLAGS"],
         supports_start_end_lib = info["SUPPORTS_START_END_LIB"] == ["True"],
         is_clang = info["IS_CLANG"] == ["True"],
+        conly_flags = info["CONLY_FLAGS"],
     )
 
 def _nixpkgs_cc_toolchain_config_impl(repository_ctx):
@@ -217,6 +219,7 @@ def _nixpkgs_cc_toolchain_config_impl(repository_ctx):
             "%{coverage_compile_flags}": get_starlark_list(info.coverage_compile_flags),
             "%{coverage_link_flags}": get_starlark_list(info.coverage_link_flags),
             "%{supports_start_end_lib}": repr(info.supports_start_end_lib),
+            "%{conly_flags}": get_starlark_list(info.conly_flags),
         },
     )
 

diff --git a/toolchains/cc/cc.nix b/toolchains/cc/cc.nix
@@ -288,6 +288,7 @@ pkgs.runCommand "bazel-${cc.orignalName or cc.name}-toolchain"
     IS_CLANG=(
       ${if cc.isClang then "True" else "False"}
     )
+    CONLY_FLAGS=()
 
     # Write CC_TOOLCHAIN_INFO
     #
@@ -319,4 +320,5 @@ pkgs.runCommand "bazel-${cc.orignalName or cc.name}-toolchain"
     write_info COVERAGE_LINK_FLAGS
     write_info SUPPORTS_START_END_LIB
     write_info IS_CLANG
+    write_info CONLY_FLAGS
   ''