diff options
author | 2017-06-20 21:22:58 +0200 | |
---|---|---|
committer | 2017-06-21 14:48:03 +0200 | |
commit | b6220e669a27cfecde9324bbe774970c720a0a1e (patch) | |
tree | 62debdfbc3995702c78d4b9148ca5407e7d18e72 | |
parent | 2ba693ffbe824136a0ca5f47d34710612f6302c3 (diff) |
Re-add host_platform and target_platform, and set them as defaults.
Part of #2219.
PiperOrigin-RevId: 159596011
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java | 6 | ||||
-rw-r--r-- | tools/platforms/platforms.BUILD | 38 |
2 files changed, 40 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" ) diff --git a/tools/platforms/platforms.BUILD b/tools/platforms/platforms.BUILD index 6fb275d318..7059bd6d75 100644 --- a/tools/platforms/platforms.BUILD +++ b/tools/platforms/platforms.BUILD @@ -57,3 +57,41 @@ constraint_value( # A default platform with nothing defined. platform(name = "default_platform") + +# A default platform referring to the host system. This only exists for +# internal build configurations, and so shouldn't be accessed by other packages. +platform( + name = "host_platform", + cpu_constraints = [ + ":x86_32", + ":x86_64", + ":ppc", + ":arm", + ":s390x", + ], + host_platform = True, + os_constraints = [ + ":osx", + ":freebsd", + ":linux", + ":windows", + ], +) + +platform( + name = "target_platform", + cpu_constraints = [ + ":x86_32", + ":x86_64", + ":ppc", + ":arm", + ":s390x", + ], + os_constraints = [ + ":osx", + ":freebsd", + ":linux", + ":windows", + ], + target_platform = True, +) |