aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/BUILD
diff options
context:
space:
mode:
authorGravatar Alois Klink <alois.klink@gmail.com>2017-07-24 14:37:18 +0200
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-07-24 21:04:36 +0200
commit69e3514c0861ba7a55f3a573985800cb0f22c983 (patch)
treea8fa816f7df1fae79ce75da92b044ec7d808dab7 /src/BUILD
parent20416ffa2bf18535d1fa2c560f996cf2ab88ea6b (diff)
Stops ARM from compiling 64-bit only C++ SingleJar (https://github.com/bazelbuild/bazel/blob/master/tools/cpp/lib_cc_configure.bzl#L106-L107)), forcing bazel to use the `SingleJar_deploy.jar` java implementation of SingleJar fixes this issue.
I suspect 32-bit Unix has the same issue, which could be fixed by adding the same configuration for `piii`, but I don't have a 32-bit x86 system to test it on. But if anyone is here by Googling the above error code, try replacing all the `arm` references in this pull request with `piii`! Closes #3382. PiperOrigin-RevId: 162923371
Diffstat (limited to 'src/BUILD')
-rw-r--r--src/BUILD9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/BUILD b/src/BUILD
index 3209cf0311..d956be7338 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -179,6 +179,9 @@ filegroup(
":windows_msvc": [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
],
+ ":arm": [
+ "//src/java_tools/singlejar:SingleJar_deploy.jar",
+ ],
"//conditions:default": [
"//src/tools/singlejar:singlejar",
],
@@ -334,6 +337,12 @@ config_setting(
visibility = ["//visibility:public"],
)
+config_setting(
+ name = "arm",
+ values = {"cpu": "arm"},
+ visibility = ["//visibility:public"],
+)
+
filegroup(
name = "srcs",
srcs = glob(["**"]) + [