Commit Diff

Commit:
d9ada3e4f865ba649c09b3ce95bf409dff8c117e
From:
Richard Miller <millerresearch@gmail.com>
Via:
Russ Cox <rsc@swtch.com>
Date:
Message:
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
Actions:
Patch | Tree
commit - 9cf92718e9f2e82c7d1f2a896b5c93b01f1ad073
commit + d9ada3e4f865ba649c09b3ce95bf409dff8c117e
blob - ff2f0b673a290bfb765cd955b40a31dd91877370
blob + cfb7826cc91002609211814625dba0893a75a58e
--- dist/buildmk
+++ 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;;
blob - 053ffea284cc3118686d5864486dbf6770d8864b
blob + 076f4e6b4ea40277da2d946dceaed64ae17098ed
--- src/mkhdr
+++ 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;;