aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar davideleoni90 <davide.leoni90@gmail.com>2017-05-15 15:16:04 +0200
committerGravatar Dmitry Lomov <dslomov@google.com>2017-05-15 19:51:15 +0200
commit033aa6cfde82cda785431b3f7fe606a111f1c922 (patch)
treec318441d116534347442c24af8248d63e1fad5a0 /tools
parent60b2812f6f7778bf1125c6431858760998f39c4b (diff)
Fixes compilation on Power8
This fixes #3000 Closes #3002. PiperOrigin-RevId: 156046356
Diffstat (limited to 'tools')
-rw-r--r--tools/cpp/CROSSTOOL5
-rw-r--r--tools/cpp/cc_configure.bzl2
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index bb22006090..d70a6dcb60 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -45,6 +45,11 @@ default_toolchain {
}
default_toolchain {
+ cpu: "ppc64"
+ toolchain_identifier: "local_linux"
+}
+
+default_toolchain {
cpu: "ios_x86_64"
toolchain_identifier: "ios_x86_64"
}
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
index e4427cd77a..d82e3f7889 100644
--- a/tools/cpp/cc_configure.bzl
+++ b/tools/cpp/cc_configure.bzl
@@ -161,7 +161,7 @@ def _get_cpu_value(repository_ctx):
return "x64_windows"
# Use uname to figure out whether we are on x86_32 or x86_64
result = repository_ctx.execute(["uname", "-m"])
- if result.stdout.strip() in ["power", "ppc64le", "ppc"]:
+ if result.stdout.strip() in ["power", "ppc64le", "ppc", "ppc64"]:
return "ppc"
if result.stdout.strip() in ["arm", "armv7l", "aarch64"]:
return "arm"