[haiku-commits] haiku: hrev46052 - build/scripts

  • From: jscipione@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 14 Sep 2013 21:01:40 +0200 (CEST)

hrev46052 adds 1 changeset to branch 'master'
old head: cfa8ecbc8679200044b2922a753490e99972e88f
new head: eeb345aa17b6da6f92b5213949ad5064e410b757
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=eeb345a+%5Ecfa8ecb

----------------------------------------------------------------------------

eeb345a: 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".

                                     [ John Scipione <jscipione@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46052
Commit:      eeb345aa17b6da6f92b5213949ad5064e410b757
URL:         http://cgit.haiku-os.org/haiku/commit/?id=eeb345a
Author:      John Scipione <jscipione@xxxxxxxxx>
Date:        Sat Sep 14 18:55:53 2013 UTC

----------------------------------------------------------------------------

2 files changed, 2 insertions(+), 2 deletions(-)
build/scripts/build_cross_tools      | 2 +-
build/scripts/build_cross_tools_gcc4 | 2 +-

----------------------------------------------------------------------------

diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index 9e2fd4e..37b7616 100755
--- a/build/scripts/build_cross_tools
+++ b/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"
diff --git a/build/scripts/build_cross_tools_gcc4 
b/build/scripts/build_cross_tools_gcc4
index f9b6023..2d58772 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -50,7 +50,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"


Other related posts:

  • » [haiku-commits] haiku: hrev46052 - build/scripts - jscipione