diff options
| author |  dslomov <dslomov@google.com> | 2017-08-21 12:52:41 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-21 14:16:34 +0200 |
| commit | 375f95b16e1a8b164d2caaa4d65a4c9b4e310bd3 (patch) | |
| tree | faf5464b37651fa52f76d63f060e6dd2b09dd522 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | |
| parent | e3684497a5a8c4bd42ff970b37c49dc70bcc3eae (diff) | |
Rename some of native declared providers according to the new naming scheme.
RELNOTES: None
PiperOrigin-RevId: 165910455
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 596a991fde..aca9e31450 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 @@ -320,11 +320,11 @@ public class CppHelper { public static CcToolchainProvider getToolchain(RuleContext ruleContext, TransitiveInfoCollection dep) { // TODO(bazel-team): Consider checking this generally at the attribute level. - if ((dep == null) || (dep.get(ToolchainInfo.SKYLARK_CONSTRUCTOR) == null)) { + if ((dep == null) || (dep.get(ToolchainInfo.PROVIDER) == null)) { ruleContext.ruleError("The selected C++ toolchain is not a cc_toolchain rule"); return CcToolchainProvider.EMPTY_TOOLCHAIN_IS_ERROR; } - return (CcToolchainProvider) dep.get(ToolchainInfo.SKYLARK_CONSTRUCTOR); + return (CcToolchainProvider) dep.get(ToolchainInfo.PROVIDER); } /** |