Fix ninja wrapper script on non-x86 linux.

ninja

Index: ninja
diff --git a/ninja b/ninja
index bd263b48ee02c91a5a2f59033eab859a93d43ccf..6c843e4a72c1bf6c8e7d9e949f049be2105c75a4 100755
--- a/ninja
+++ b/ninja
@@ -20,12 +20,18 @@ EOF
 
 case "$OS" in
   Linux)
-    MACHINE=$(getconf LONG_BIT)
+    MACHINE=$(uname -m)
     case "$MACHINE" in
-      32|64)  exec "${THIS_DIR}/ninja-linux${MACHINE}" "$@";;
-      *)      echo Unknown architecture \($MACHINE\) -- unable to run ninja.
-              print_help
-              exit 1;;
+      i686|x86_64)

[Nico, 2013/10/08 16:24:09]

i*86?

[Sam Clegg, 2013/10/08 18:21:49]

Done.

+        LONG_BIT=$(getconf LONG_BIT)
+        # We know we are on x86 but we need to use getconf to determine
+        # bittage of the userspace install (e.g. when runing 32-bit userspace
+        # x86_64 hardware.

[Lei Zhang, 2013/10/08 16:27:57]

nit: s/hardware/kernel/

[Sam Clegg, 2013/10/08 18:21:49]

Done.

+        exec "${THIS_DIR}/ninja-linux${LONG_BIT}" "$@";;
+      *)
+        echo Unknown architecture \($MACHINE\) -- unable to run ninja.
+        print_help
+        exit 1;;
     esac
     ;;
   Darwin)    exec "${THIS_DIR}/ninja-mac" "$@";;