From 98c55e5b672722e6c9eab6b16cf671653d30f59d Mon Sep 17 00:00:00 2001
From: Jens Ole Lauridsen <jlauridsen@google.com>
Date: Thu, 16 Feb 2023 14:19:22 -0800
Subject: [PATCH] Add feature archive_param_file to cc toolchain

This is a new feature added to the bazel toolchain.
Without it there will not be a link param file on
Windows. For the Skia Parser we encountered this
bug with bazel 6.0.0:
- https://github.com/bazelbuild/bazel/issues/17068

Bug: 267540183
Test: N/A
Change-Id: I31a53dddfa1d570565ffdb95216ca71196f01379

Former-commit-id: 82d995e32ad6fcbc6e019b0a16e8c7fdc862cfcc
---
 bazel/toolchains/cc_toolchain_config.bzl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bazel/toolchains/cc_toolchain_config.bzl b/bazel/toolchains/cc_toolchain_config.bzl
index d9f6f910f83..be6596fcb36 100755
--- a/bazel/toolchains/cc_toolchain_config.bzl
+++ b/bazel/toolchains/cc_toolchain_config.bzl
@@ -446,6 +446,11 @@ def _impl(ctx):
         ],
     )
 
+    archive_param_file_feature = feature(
+        name = "archive_param_file",
+        enabled = True,
+    )
+
     compiler_param_file_feature = feature(
         name = "compiler_param_file",
     )
@@ -1852,6 +1857,7 @@ def _impl(ctx):
 
     if ctx.attr.cpu == "k8":
         features = [
+            archive_param_file_feature,
             dependency_file_feature,
             random_seed_feature,
             pic_feature,
@@ -1910,6 +1916,7 @@ def _impl(ctx):
         ]
     elif ctx.attr.cpu == "x64_windows":
         features = [
+            archive_param_file_feature,
             no_legacy_features_feature,
             nologo_feature,
             has_configured_linker_path_feature,