commit 033aa6cfde82cda785431b3f7fe606a111f1c922
author davideleoni90 <davide.leoni90@gmail.com> Mon May 15 15:16:04 2017 +0200
committer Dmitry Lomov <dslomov@google.com> Mon May 15 19:51:15 2017 +0200
tree c318441d116534347442c24af8248d63e1fad5a0
parent 60b2812f6f7778bf1125c6431858760998f39c4b

Fixes compilation on Power8

This fixes #3000

Closes #3002.

PiperOrigin-RevId: 156046356

tools/cpp/CROSSTOOL

diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index bb22006..d70a6dc 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -45,6 +45,11 @@
 }
 
 default_toolchain {
+  cpu: "ppc64"
+  toolchain_identifier: "local_linux"
+}
+
+default_toolchain {
   cpu: "ios_x86_64"
   toolchain_identifier: "ios_x86_64"
 }

tools/cpp/cc_configure.bzl

diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
index e4427cd..d82e3f7 100644
--- a/tools/cpp/cc_configure.bzl
+++ b/tools/cpp/cc_configure.bzl
@@ -161,7 +161,7 @@
     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"