From d9ada3e4f865ba649c09b3ce95bf409dff8c117e Mon Sep 17 00:00:00 2001 From: Richard Miller Date: Wed, 18 May 2011 13:21:40 -0400 Subject: build: fix for non-standard uname The scratchbox-based SDK for maemo cross-compilation (for Nokia N800 and N900) has a non-standard uname command which doesn't support the '-p' option. This patch allows INSTALL to work anyway, by issuing 'uname -m' if 'uname -m -p' fails. R=rsc CC=plan9port.codebot http://codereview.appspot.com/4554041 --- dist/buildmk | 2 +- src/mkhdr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/buildmk b/dist/buildmk index ff2f0b67..cfb7826c 100755 --- a/dist/buildmk +++ b/dist/buildmk @@ -2,7 +2,7 @@ # run this in the src directory SYSNAME=`uname` export SYSNAME -OBJTYPE=`uname -m -p | sed ' +OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed ' s;.*i[3-6]86.*;386;; s;.*i86pc.*;386;; s;.*amd64.*;x86_64;; diff --git a/src/mkhdr b/src/mkhdr index 053ffea2..076f4e6b 100644 --- a/src/mkhdr +++ b/src/mkhdr @@ -1,6 +1,6 @@ # if you change this, also edit ../dist/buildmk SYSNAME=`uname` -OBJTYPE=`uname -m -p | sed ' +OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed ' s;.*i[3-6]86.*;386;; s;.*i86pc.*;386;; s;.*amd64.*;x86_64;; -- cgit v1.2.3