diff options
| author |  John Cater <jcater@google.com> | 2017-07-20 17:35:20 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-21 09:12:14 +0200 |
| commit | 00006dcd3202faea815b6621356c277336234151 (patch) | |
| tree | dd9052edd657b4633c403b7fac4aded48e10c13d /src/main/java/com/google/devtools/build/lib/analysis/PlatformConfigurationLoader.java | |
| parent | 1afbac0775d277625a07e318d4eae4627b093225 (diff) | |
Add --toolchain_resolution_override to allow specifying the toolchain for a given type.
Fixes https://github.com/katre/bazel/issues/6.
Change-Id: I6c6e303384277b013bdc27eb80743aa51f2fb98a
PiperOrigin-RevId: 162618674
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/PlatformConfigurationLoader.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/PlatformConfigurationLoader.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfigurationLoader.java index 1eedd1265b..2e6ced471f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfigurationLoader.java @@ -47,6 +47,10 @@ public class PlatformConfigurationLoader implements ConfigurationFragmentFactory // TODO(katre): This will change with remote execution. Label executionPlatform = options.hostPlatform; - return new PlatformConfiguration(executionPlatform, options.platforms, options.extraToolchains); + return new PlatformConfiguration( + executionPlatform, + options.platforms, + options.extraToolchains, + options.toolchainResolutionOverrides); } } |