diff options
| author |  Arielle Albon <arielle@hopeless-newbie.co.uk> | 2018-07-31 00:57:54 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-31 00:59:22 -0700 |
| commit | fa7e49fb72a7f4c2f25107c6fb9550244ff54ac1 (patch) | |
| tree | 248655acc49716c4522e43eec64d5c63ca3f16b0 /src/conditions | |
| parent | 15b27e46ad766e777fb898f39bff06efa9268c2a (diff) | |
Add aarch64 embedded JDK config, MacOS mock toolchain settings
Hi,
This PR is for additional work to get the tests running correctly on Aarch64. One key issue was that the default embedded jvm used by default was X86_64 and does not work on other architectures.
To support this I have added a new constraint, however I will refine this in case a version of Darwin becomes available on aarch64.
I'll do the work to find a good arm32 toolchain in a future CL. I do not have access for ppc or z390 to repair those architectures.
Either way, hope this is good for you.
Closes #5525.
PiperOrigin-RevId: 206717726
Diffstat (limited to 'src/conditions')
| -rw-r--r-- | src/conditions/BUILD | 6 | ||||
| -rw-r--r-- | src/conditions/BUILD.tools | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/conditions/BUILD b/src/conditions/BUILD index 11d0cbfb17..2b28e28057 100644 --- a/src/conditions/BUILD +++ b/src/conditions/BUILD @@ -53,6 +53,12 @@ config_setting( ) config_setting( + name = "linux_aarch64", + values = {"cpu": "aarch64"}, + visibility = ["//visibility:public"], +) + +config_setting( name = "remote", values = {"define": "EXECUTOR=remote"}, visibility = ["//visibility:public"], diff --git a/src/conditions/BUILD.tools b/src/conditions/BUILD.tools index 280be6578b..246302b758 100644 --- a/src/conditions/BUILD.tools +++ b/src/conditions/BUILD.tools @@ -11,6 +11,12 @@ config_setting( ) config_setting( + name = "linux_aarch64", + values = {"cpu": "aarch64"}, + visibility = ["//visibility:public"], +) + +config_setting( name = "darwin_x86_64", values = {"cpu": "darwin_x86_64"}, visibility = ["//visibility:public"], |