diff options
| author |  John Cater <jcater@google.com> | 2017-11-21 08:06:16 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-21 08:07:39 -0800 |
| commit | 856b4dd190779ded5c2976f9b35fcc79606cc0d7 (patch) | |
| tree | 9abd8d9792c8f038b82661ac13b9a639ab9521cb /src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java | |
| parent | 2ed3261931ac7282fa926cf54a70ed41df853a62 (diff) | |
Added new RuleClass flag to turn off platform support, to stop dependency cycles when loading platforms.
Part of #4128.
Change-Id: Ie55a91aaaec15d8eb537f59131fc2e69a8f9c251
PiperOrigin-RevId: 176509311
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java index 6676a18321..ca311c8989 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java @@ -114,6 +114,9 @@ public class ToolchainUtil { throws InterruptedException, ToolchainContextException { PlatformConfiguration platformConfiguration = configuration.getFragment(PlatformConfiguration.class); + if (platformConfiguration == null) { + return null; + } Label executionPlatformLabel = platformConfiguration.getExecutionPlatform(); Label targetPlatformLabel = platformConfiguration.getTargetPlatforms().get(0); |