tbuild: work around broken Linux uname -p - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 9f8b1dc7fa6c53b7340ea5179f3d9e4310cd897d
DIR parent a4980b3957ee745dfd1560f531ce5da1b3e41343
HTML Author: Russ Cox <rsc@swtch.com>
Date: Thu, 16 Jul 2009 03:30:22 -0400
build: work around broken Linux uname -p
fixes #8 http://bitbucket.org/rsc/plan9port/issue/8/
http://groups.google.com/group/plan9port-dev/t/8d1a2362dde4f137
http://codereview.appspot.com/95058
Diffstat:
M dist/buildmk | 23 +++++++++++------------
M src/mkhdr | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 23 deletions(-)
---
DIR diff --git a/dist/buildmk b/dist/buildmk
t@@ -2,17 +2,16 @@
# run this in the src directory
SYSNAME=`uname` export SYSNAME
-OBJTYPE=`uname -p | sed '
- s;i.86;386;;
- s;i86pc;386;;
- s;amd64;x86_64;;
- s;/.*;;; s; ;;g;
- s;armv.*;arm;g;
- s;powerpc;power;g;
- s;PowerMacintosh;power;g;
- s;macppc;power;g;
- s;ppc64;power;g;
- s;ppc;power;g;
+OBJTYPE=`uname -m -p | sed '
+ s;.*i[3-6]86.*;386;;
+ s;.*i86pc.*;386;;
+ s;.*amd64.*;x86_64;;
+ s;.*x86_64.*;x86_64;;
+ s;.*armv.*;arm;g;
+ s;.*powerpc.*;power;g;
+ s;.*PowerMacintosh.*;power;g;
+ s;.*macppc.*;power;g;
+ s;.*ppc64.*;power;g;
+ s;.*ppc.*;power;g;
'` export OBJTYPE
sh -x mkmk.sh
-
DIR diff --git a/src/mkhdr b/src/mkhdr
t@@ -1,16 +1,16 @@
# if you change this, also edit ../dist/buildmk
SYSNAME=`uname`
-OBJTYPE=`uname -p | sed '
- s;i.86;386;;
- s;i86pc;386;;
- s;amd64;x86_64;;
- s;/.*;;; s; ;;g;
- s;armv.*;arm;g;
- s;powerpc;power;g;
- s;PowerMacintosh;power;g;
- s;macppc;power;g;
- s;ppc64;power;g;
- s;ppc;power;g;
+OBJTYPE=`uname -m -p | sed '
+ s;.*i[3-6]86.*;386;;
+ s;.*i86pc.*;386;;
+ s;.*amd64.*;x86_64;;
+ s;.*x86_64.*;x86_64;;
+ s;.*armv.*;arm;g;
+ s;.*powerpc.*;power;g;
+ s;.*PowerMacintosh.*;power;g;
+ s;.*macppc.*;power;g;
+ s;.*ppc64.*;power;g;
+ s;.*ppc.*;power;g;
'`
BIN=$PLAN9/bin