aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com
diff options
context:
space:
mode:
authorGravatar jcater <jcater@google.com>2017-06-20 21:22:58 +0200
committerGravatar Philipp Wollermann <philwo@google.com>2017-06-21 14:48:03 +0200
commitb6220e669a27cfecde9324bbe774970c720a0a1e (patch)
tree62debdfbc3995702c78d4b9148ca5407e7d18e72 /src/main/java/com
parent2ba693ffbe824136a0ca5f47d34710612f6302c3 (diff)
Re-add host_platform and target_platform, and set them as defaults.
Part of #2219. PiperOrigin-RevId: 159596011
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java6
1 files changed, 2 insertions, 4 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 b9c81756c3..dbe8ae1da0 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
@@ -28,8 +28,7 @@ public class PlatformOptions extends FragmentOptions {
@Option(
name = "experimental_host_platform",
converter = BuildConfiguration.LabelConverter.class,
- // TODO(katre): Use @bazel_tools//platforms:host_platform when available.
- defaultValue = "@bazel_tools//platforms:default_platform",
+ defaultValue = "@bazel_tools//platforms:host_platform",
optionUsageRestrictions = OptionsParser.OptionUsageRestrictions.HIDDEN,
help = "Declare the platform the build is started from"
)
@@ -40,8 +39,7 @@ public class PlatformOptions extends FragmentOptions {
@Option(
name = "experimental_platforms",
converter = BuildConfiguration.LabelListConverter.class,
- // TODO(katre): Use @bazel_tools//platforms:target_platform when available.
- defaultValue = "@bazel_tools//platforms:default_platform",
+ defaultValue = "@bazel_tools//platforms:target_platform",
optionUsageRestrictions = OptionsParser.OptionUsageRestrictions.HIDDEN,
help = "Declare the platforms targeted by the current build"
)