diff options
| author |  lberki <lberki@google.com> | 2018-04-24 05:29:15 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-24 05:30:53 -0700 |
| commit | dd9570b556e210da63a4ae882b55caf9fa10a995 (patch) | |
| tree | 16d381254b228beaf2c7dde3a773f29d6e648c64 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java | |
| parent | 2c957575ff24c183d48ade4345a79ffa5bec3724 (diff) | |
Make the constructor of TemplateVariableInfo available in Skylark.
RELNOTES[NEW]: TemplateVariableInfo can now be constructed from Skylark.
PiperOrigin-RevId: 194072452
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java index 172aaf2ed1..5475261c1e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java @@ -51,6 +51,7 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; +import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.License; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.Builder; @@ -574,7 +575,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { configuration.isHostConfiguration()); TemplateVariableInfo templateVariableInfo = - createMakeVariableProvider(cppConfiguration, sysroot); + createMakeVariableProvider(cppConfiguration, sysroot, ruleContext.getRule().getLocation()); RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(ruleContext) @@ -820,7 +821,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { } private TemplateVariableInfo createMakeVariableProvider( - CppConfiguration cppConfiguration, PathFragment sysroot) { + CppConfiguration cppConfiguration, PathFragment sysroot, Location location) { HashMap<String, String> makeVariables = new HashMap<>(cppConfiguration.getAdditionalMakeVariables()); @@ -832,7 +833,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { ccFlags = ccFlags.isEmpty() ? sysrootFlag : ccFlags + " " + sysrootFlag; makeVariables.put(CppConfiguration.CC_FLAGS_MAKE_VARIABLE_NAME, ccFlags); } - return new TemplateVariableInfo(ImmutableMap.copyOf(makeVariables)); + return new TemplateVariableInfo(ImmutableMap.copyOf(makeVariables), location); } /** |