From fea32be42928c84463aa1f335b5722a1f6b8c93a Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Wed, 22 Jun 2022 04:17:41 -0700
Subject: [PATCH] Preserve --experimental_allow_unresolved_symlinks in exec cfg

See https://github.com/bazelbuild/bazel/issues/10298#issuecomment-1097097541

Work towards https://github.com/bazelbuild/bazel/issues/10298

Closes #15702.

PiperOrigin-RevId: 456480627
Change-Id: Ib1237ce9e2c0bab0d7eabd8743f08ec60b8b7ab7
---
 .../build/lib/analysis/config/CoreOptions.java  |  1 +
 src/test/shell/bazel/bazel_symlink_test.sh      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
index 286657b630560d..bc68d184dab915 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
@@ -947,6 +947,7 @@ public FragmentOptions getHost() {
     host.archivedArtifactsMnemonicsFilter = archivedArtifactsMnemonicsFilter;
 
     host.enableAspectHints = enableAspectHints;
+    host.allowUnresolvedSymlinks = allowUnresolvedSymlinks;
 
     return host;
   }
diff --git a/src/test/shell/bazel/bazel_symlink_test.sh b/src/test/shell/bazel/bazel_symlink_test.sh
index 5e0772c247781d..cee345e22db55a 100755
--- a/src/test/shell/bazel/bazel_symlink_test.sh
+++ b/src/test/shell/bazel/bazel_symlink_test.sh
@@ -584,4 +584,21 @@ EOF
   expect_log "cycle in dependency graph"
 }
 
+function test_unresolved_symlink_in_exec_cfg() {
+  mkdir -p a
+  cat > a/BUILD <<'EOF'
+load("//symlink:symlink.bzl", "dangling_symlink")
+dangling_symlink(name="a", link_target="non/existent")
+genrule(
+    name = "exec",
+    srcs = [],
+    outs = ["out"],
+    cmd = "touch $@",
+    exec_tools = [":a"],
+)
+EOF
+
+  bazel --windows_enable_symlinks build --experimental_allow_unresolved_symlinks //a:exec || fail "build failed"
+}
+
 run_suite "Tests for symlink artifacts"