C++: Introduces flag to disable automatic expansion of labels in linkopts.

LSC is finished.

RELNOTES:none
PiperOrigin-RevId: 199619978

3 files changed, 15 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index f7558ffa75..317d52db40 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -995,6 +995,10 @@ public final class CppConfiguration extends BuildConfiguration.Fragment
     return cppOptions.useInterfaceSharedObjects;
   }
 
+  public boolean getExpandLinkoptsLabels() {
+    return cppOptions.expandLinkoptsLabels;
+  }
+
   /**
    * Returns the path to the GNU binutils 'objcopy' binary to use for this build. (Corresponds to
    * $(OBJCOPY) in make-dbg.) Relative paths are relative to the execution root.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index 646ad4c9e6..0b19fd488f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -200,7 +200,8 @@ public class CppHelper {
     List<String> result = new ArrayList<>();
     Expander expander = ruleContext.getExpander().withDataExecLocations();
     for (String value : values) {
-      if (isLinkoptLabel(value)) {
+      if (ruleContext.getFragment(CppConfiguration.class).getExpandLinkoptsLabels()
+          && isLinkoptLabel(value)) {
         if (!expandLabel(ruleContext, result, value)) {
           ruleContext.attributeError(attrName, "could not resolve label '" + value + "'");
         }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index c5adab6cad..04e197ce62 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -966,6 +966,15 @@ public class CppOptions extends FragmentOptions {
   )
   public boolean useLLVMCoverageMapFormat;
 
+  @Option(
+      name = "experimental_expand_linkopts_labels",
+      defaultValue = "true",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
+      metadataTags = {OptionMetadataTag.EXPERIMENTAL},
+      help = "If true, entries in linkopts that are not preceded by - or $ will be expanded.")
+  public boolean expandLinkoptsLabels;
+
   @Override
   public FragmentOptions getHost() {
     CppOptions host = (CppOptions) getDefault();