ref: f5aeef6ef8b6252d89b44cb98200c5b60a095080
parent: 10ae99c67b66ebacb997068b12b47062237a0f32
parent: ffd5b58f9144c40dbfd1cf9ea99d089a3f4e4f42
author: John Koleszar <jkoleszar@google.com>
date: Thu Jun 10 03:21:03 EDT 2010
Merge "Detect toolchain based on gcc -dumpmachine"
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -497,10 +497,10 @@
process_common_toolchain() {if [ -z "$toolchain" ]; then
- uname="$(uname -a)"
+ gcctarget="$(gcc -dumpmachine 2> /dev/null)"
# detect tgt_isa
- case "$uname" in
+ case "$gcctarget" in
*x86_64*)
tgt_isa=x86_64
;;
@@ -510,19 +510,19 @@
esac
# detect tgt_os
- case "$uname" in
- *Darwin\ Kernel\ Version\ 8*)
+ case "$gcctarget" in
+ *darwin8*)
tgt_isa=universal
tgt_os=darwin8
;;
- *Darwin\ Kernel\ Version\ 9*)
+ *darwin9*)
tgt_isa=universal
tgt_os=darwin9
;;
- *Msys*|*Cygwin*)
+ *msys*|*cygwin*)
tgt_os=win32
;;
- *Linux*|*BSD*)
+ *linux*|*bsd*)
tgt_os=linux
;;
esac