Fix x32 check in configure script

[GoogleCodeExporter]

Currently, the configure script checks for x32 by testing just the __ILP32__ 
define.  However, on "plain" i386, __ILP32__ can also be defined, for example 
by clang 3.5.0 and higher.  (That gcc does not define it there, is another 
issue, but not for this tracker.)

Therefore, extend the check by also checking for __x86_64__, which will also be 
defined for x32:

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 9327ce9..47cfef2 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1118,7 +1118,7 @@ EOF
       bits=32
       enabled x86_64 && bits=64
       check_cpp <<EOF && bits=x32
-#ifndef __ILP32__
+#if !defined(__ILP32__) || !defined(__x86_64__)
 #error "not x32"
 #endif
 EOF

Original issue reported on code.google.com by dimte...@gmail.com on 3 Dec 2014 at 8:33

[GoogleCodeExporter]

Would you please sign the CLA and upload the patch to gerrit:
http://www.webmproject.org/code/contribute/submitting-patches/

Original comment by johannko...@google.com on 3 Dec 2014 at 8:38

• Changed state: Assigned

[GoogleCodeExporter]

https://gerrit.chromium.org/gerrit/73151

Original comment by dimte...@gmail.com on 3 Dec 2014 at 9:08

[GoogleCodeExporter]

Merged! Thanks for the patch.

Original comment by johannko...@google.com on 19 Dec 2014 at 1:55

• Changed state: Fixed