diff options
| author |  plf <plf@google.com> | 2018-07-20 01:51:59 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-20 01:52:58 -0700 |
| commit | 929a4a2aa16c34bd7631e14a82dca125db89ddd5 (patch) | |
| tree | 114ac0ed544729dbc50418dec6407250448518e9 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 134f00d62abf57c6fe90893a006311f9a93c4722 (diff) | |
C++: Cleans up C++ Skylark API
Feature configuration and toolchain are now mandatory arguments. Rule context
is no longer a positional argument.
RELNOTES:none
PiperOrigin-RevId: 205367825
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java index 1a6911c667..fee468a2dc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java @@ -395,15 +395,8 @@ public class CcModule CcCommon.checkRuleWhitelisted(skylarkRuleContext); RuleContext ruleContext = skylarkRuleContext.getRuleContext(); CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null); - if (ccToolchainProvider == null) { - ccToolchainProvider = CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext); - } FeatureConfiguration featureConfiguration = convertFromNoneable(skylarkFeatureConfiguration, null); - if (featureConfiguration == null) { - featureConfiguration = - CcCommon.configureFeaturesOrReportRuleError(ruleContext, ccToolchainProvider); - } Pair<List<Artifact>, List<Artifact>> separatedHeadersAndSources = separateSourcesFromHeaders(sources); FdoSupportProvider fdoSupport = @@ -483,15 +476,8 @@ public class CcModule CcCommon.checkRuleWhitelisted(skylarkRuleContext); RuleContext ruleContext = skylarkRuleContext.getRuleContext(); CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null); - if (ccToolchainProvider == null) { - ccToolchainProvider = CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext); - } FeatureConfiguration featureConfiguration = convertFromNoneable(skylarkFeatureConfiguration, null); - if (featureConfiguration == null) { - featureConfiguration = - CcCommon.configureFeaturesOrReportRuleError(ruleContext, ccToolchainProvider); - } FdoSupportProvider fdoSupport = CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext); NestedSet<String> linkopts = |