Use uname -s instead of uname -o

...since BSD uname (on OS X at least) doesn't have a -o param, only a -s,
Haiku has both, and both print "Haiku".

build/scripts/build_cross_tools

@@ -20,7 +20,7 @@ additionalMakeArgs=$*
 	# additional flags for the binutils build. Should there ever be any other
 	# flags than -jN, we need to handle this differently.
 
-if [ `uname -o` = 'Haiku' ]; then
+if [ `uname -s` = 'Haiku' ]; then
 	# force cross-build if building on Haiku:
 	buildhostMachine=i586-pc-haiku_buildhost
 	buildHostSpec="--build=$buildhostMachine --host=$buildhostMachine"

build/scripts/build_cross_tools_gcc4

@@ -40,7 +40,7 @@ arm-*)
 	;;
 esac
 
-if [ `uname -o` = 'Haiku' ]; then
+if [ `uname -s` = 'Haiku' ]; then
 	# force cross-build if building on Haiku:
 	buildhostMachine=${haikuMachine}_buildhost
 	buildHostSpec="--build=$buildhostMachine --host=$buildhostMachine"