diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java index 3376e9609d..dd65946476 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java @@ -36,7 +36,7 @@ public class PlatformOptions extends FragmentOptions { @Option( name = "experimental_host_platform", converter = BuildConfiguration.LabelConverter.class, - defaultValue = "@bazel_tools//platforms:host_platform", + defaultValue = "@bazel_tools//tools/platforms:host_platform", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = {OptionMetadataTag.HIDDEN}, @@ -49,7 +49,7 @@ public class PlatformOptions extends FragmentOptions { @Option( name = "experimental_platforms", converter = BuildConfiguration.LabelListConverter.class, - defaultValue = "@bazel_tools//platforms:target_platform", + defaultValue = "@bazel_tools//tools/platforms:target_platform", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = {OptionMetadataTag.HIDDEN}, @@ -60,7 +60,7 @@ public class PlatformOptions extends FragmentOptions { @Option( name = "extra_toolchains", converter = LabelListConverter.class, - defaultValue = "", + defaultValue = "@bazel_tools//tools/cpp:dummy_cc_toolchain", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = {OptionMetadataTag.HIDDEN}, @@ -98,6 +98,8 @@ public class PlatformOptions extends FragmentOptions { public PlatformOptions getHost(boolean fallback) { PlatformOptions host = (PlatformOptions) getDefault(); host.platforms = ImmutableList.of(this.hostPlatform); + host.hostPlatform = this.hostPlatform; + host.extraToolchains = this.extraToolchains; return host; } |