diff options
author | 2018-06-07 05:23:22 -0700 | |
---|---|---|
committer | 2018-06-07 05:24:53 -0700 | |
commit | 8ecb2a4b74e073337062e97d919b72344f6b42a3 (patch) | |
tree | 45c4aff5b5177cb207ea738bfec10126085b12d3 /src/main/java/com/google/devtools/build | |
parent | 2df323407b1df9c50b12d9de9febf7a6f0cd19bd (diff) |
C++: Introduces flag to disable automatic expansion of labels in linkopts.
LSC is finished.
RELNOTES:none
PiperOrigin-RevId: 199619978
Diffstat (limited to 'src/main/java/com/google/devtools/build')
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(); |