aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2016-05-11 09:50:38 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-05-11 10:25:07 +0000
commit4caa04f007f77f367c857e365ca8c3d6621c4940 (patch)
tree543e749e64738033b6347163b6f55ebc88b9543d
parent66ce9030d2d2a100593b90b1d0e2188001db2d3e (diff)
cc_configure: correctly detect 32/64 bits CPU for Linux
It is now consistent with CPU.java Fixes #1251. -- MOS_MIGRATED_REVID=122036487
-rw-r--r--tools/cpp/cc_configure.bzl2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
index 7f33475962..226f10fdba 100644
--- a/tools/cpp/cc_configure.bzl
+++ b/tools/cpp/cc_configure.bzl
@@ -105,7 +105,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"])
- return "piii" if result.stdout.strip() == "i386" else "k8"
+ return "k8" if result.stdout.strip() in ["amd64", "x86_64", "x64"] else "piii"
_INC_DIR_MARKER_BEGIN = "#include <...>"