diff options
5 files changed, 22 insertions, 20 deletions
diff --git a/compile.sh b/compile.sh index 076dd2492a..8a8a584dda 100755 --- a/compile.sh +++ b/compile.sh @@ -86,8 +86,8 @@ log "Building output/bazel" # We set host and target platform directly since the defaults in @bazel_tools # have not yet been generated. bazel_build "src:bazel${EXE_EXT}" \ - --experimental_host_platform=//tools/platforms:host_platform \ - --experimental_platforms=//tools/platforms:target_platform \ + --host_platform=//tools/platforms:host_platform \ + --platforms=//tools/platforms:target_platform \ || fail "Could not build Bazel" bazel_bin_path="$(get_bazel_bin_path)/src/bazel${EXE_EXT}" [ -e "$bazel_bin_path" ] \ 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 6a53a5a34a..445f8e7684 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 @@ -34,7 +34,8 @@ import java.util.List; public class PlatformOptions extends FragmentOptions { @Option( - name = "experimental_host_platform", + name = "host_platform", + oldName = "experimental_host_platform", converter = BuildConfiguration.EmptyToNullLabelConverter.class, defaultValue = "@bazel_tools//platforms:host_platform", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, @@ -47,7 +48,8 @@ public class PlatformOptions extends FragmentOptions { // TODO(katre): Add execution platforms. @Option( - name = "experimental_platforms", + name = "platforms", + oldName = "experimental_platforms", converter = BuildConfiguration.LabelListConverter.class, defaultValue = "@bazel_tools//platforms:target_platform", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java index 8177415512..62ce808c39 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RuleContextTest.java @@ -33,8 +33,8 @@ public class RuleContextTest extends ToolchainTestCase { public void testMockRuleContextHasToolchains() throws Exception { mockToolsConfig.create("x/BUILD", "mock_toolchain_rule(name='x')"); useConfiguration( - "--experimental_host_platform=//platforms:linux", - "--experimental_platforms=//platforms:mac"); + "--host_platform=//platforms:linux", + "--platforms=//platforms:mac"); RuleContext ruleContext = getRuleContext(getConfiguredTarget("//x")); assertThat(ruleContext.getToolchainContext().getResolvedToolchainLabels()) .contains(Label.parseAbsolute("//toolchain:test_toolchain_1")); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java index 40f6aad215..cae6decfd8 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainUtilTest.java @@ -73,8 +73,8 @@ public class ToolchainUtilTest extends ToolchainTestCase { @Test public void createToolchainContext() throws Exception { useConfiguration( - "--experimental_host_platform=//platforms:linux", - "--experimental_platforms=//platforms:mac"); + "--host_platform=//platforms:linux", + "--platforms=//platforms:mac"); CreateToolchainContextKey key = CreateToolchainContextKey.create("test", ImmutableSet.of(testToolchainType), targetConfig); @@ -100,8 +100,8 @@ public class ToolchainUtilTest extends ToolchainTestCase { @Test public void createToolchainContext_unavailableToolchainType_single() throws Exception { useConfiguration( - "--experimental_host_platform=//platforms:linux", - "--experimental_platforms=//platforms:mac"); + "--host_platform=//platforms:linux", + "--platforms=//platforms:mac"); CreateToolchainContextKey key = CreateToolchainContextKey.create( "test", @@ -131,8 +131,8 @@ public class ToolchainUtilTest extends ToolchainTestCase { @Test public void createToolchainContext_unavailableToolchainType_multiple() throws Exception { useConfiguration( - "--experimental_host_platform=//platforms:linux", - "--experimental_platforms=//platforms:mac"); + "--host_platform=//platforms:linux", + "--platforms=//platforms:mac"); CreateToolchainContextKey key = CreateToolchainContextKey.create( "test", diff --git a/src/test/shell/bazel/toolchain_test.sh b/src/test/shell/bazel/toolchain_test.sh index 1ec1e9f8b0..a3cb3fcb4c 100755 --- a/src/test/shell/bazel/toolchain_test.sh +++ b/src/test/shell/bazel/toolchain_test.sh @@ -498,22 +498,22 @@ EOF # This should use toolchain_1. bazel build \ - --experimental_host_platform=//:platform1 \ - --experimental_platforms=//:platform2 \ + --host_platform=//:platform1 \ + --platforms=//:platform2 \ //demo:use &> $TEST_log || fail "Build failed" expect_log 'Using toolchain: rule message: "this is the rule", toolchain extra_str: "foo from 1"' # This should use toolchain_2. bazel build \ - --experimental_host_platform=//:platform2 \ - --experimental_platforms=//:platform1 \ + --host_platform=//:platform2 \ + --platforms=//:platform1 \ //demo:use &> $TEST_log || fail "Build failed" expect_log 'Using toolchain: rule message: "this is the rule", toolchain extra_str: "foo from 2"' # This should not match any toolchains. bazel build \ - --experimental_host_platform=//:platform1 \ - --experimental_platforms=//:platform1 \ + --host_platform=//:platform1 \ + --platforms=//:platform1 \ //demo:use &> $TEST_log && fail "Build failure expected" expect_log 'While resolving toolchains for target //demo:use: no matching toolchains found for types //toolchain:test_toolchain' expect_not_log 'Using toolchain: rule message:' @@ -645,10 +645,10 @@ EOF filegroup(name = 'not_a_platform') EOF - bazel build --experimental_platforms=//platform:not_a_platform //demo:use &> $TEST_log && fail "Build failure expected" + bazel build --platforms=//platform:not_a_platform //demo:use &> $TEST_log && fail "Build failure expected" expect_log "While resolving toolchains for target //demo:use: Target filegroup rule //platform:not_a_platform was found as the target platform, but does not provide PlatformInfo" - bazel build --experimental_host_platform=//platform:not_a_platform //demo:use &> $TEST_log && fail "Build failure expected" + bazel build --host_platform=//platform:not_a_platform //demo:use &> $TEST_log && fail "Build failure expected" expect_log "While resolving toolchains for target //demo:use: Target filegroup rule //platform:not_a_platform was found as the execution platform, but does not provide PlatformInfo" } |