Add explicit linux config setting in @bazel_tools and use that for th…

…e remotejdk config_setting.
bazelbuild · Sep 25, 2018 · 42fd1ae · 42fd1ae
1 parent 153ef32
commit 42fd1ae
Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/conditions/BUILD.tools b/src/conditions/BUILD.tools
@@ -10,6 +10,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "linux_x86_64",
+    values = {"cpu": "k8"},
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "linux_aarch64",
     values = {"cpu": "aarch64"},

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
@@ -342,7 +342,9 @@ alias(
         "//src/conditions:darwin_x86_64": "@remotejdk_macos//:jdk",
         "//src/conditions:windows": "@remotejdk_win//:jdk",
         "//src/conditions:linux_aarch64": "@remotejdk_linux_aarch64//:jdk",
-        "//conditions:default": "@remotejdk_linux//:jdk",
+        "//src/conditions:linux_x86_64": "@remotejdk_linux//:jdk",
+        # Fall back to the local JDK on any other platform.
+        "//conditions:default": "@local_jdk//:jdk",
     }),
     visibility = ["//visibility:public"],
 )