o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: work around broken Linux uname -p

Browse source 
fixes #8 http://bitbucket.org/rsc/plan9port/issue/8/
http://groups.google.com/group/plan9port-dev/t/8d1a2362dde4f137

http://codereview.appspot.com/95058
This commit is contained in:
Russ Cox 2009-07-16 03:30:22 -04:00
parent a4980b3957
commit 9f8b1dc7fa
2 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
dist/buildmk vendored
View file

@ -2,17 +2,16 @@
# run this in the src directory # run this in the src directory
SYSNAME=`uname` export SYSNAME SYSNAME=`uname` export SYSNAME
OBJTYPE=`uname -p | sed ' OBJTYPE=`uname -m -p | sed '
s;i.86;386;; s;.*i[3-6]86.*;386;;
s;i86pc;386;; s;.*i86pc.*;386;;
s;amd64;x86_64;; s;.*amd64.*;x86_64;;
s;/.*;;; s; ;;g; s;.*x86_64.*;x86_64;;
s;armv.*;arm;g; s;.*armv.*;arm;g;
s;powerpc;power;g; s;.*powerpc.*;power;g;
s;PowerMacintosh;power;g; s;.*PowerMacintosh.*;power;g;
s;macppc;power;g; s;.*macppc.*;power;g;
s;ppc64;power;g; s;.*ppc64.*;power;g;
s;ppc;power;g; s;.*ppc.*;power;g;
'` export OBJTYPE '` export OBJTYPE
sh -x mkmk.sh sh -x mkmk.sh

22
src/mkhdr
View file

@ -1,16 +1,16 @@
# if you change this, also edit ../dist/buildmk # if you change this, also edit ../dist/buildmk
SYSNAME=`uname` SYSNAME=`uname`
OBJTYPE=`uname -p | sed ' OBJTYPE=`uname -m -p | sed '
s;i.86;386;; s;.*i[3-6]86.*;386;;
s;i86pc;386;; s;.*i86pc.*;386;;
s;amd64;x86_64;; s;.*amd64.*;x86_64;;
s;/.*;;; s; ;;g; s;.*x86_64.*;x86_64;;
s;armv.*;arm;g; s;.*armv.*;arm;g;
s;powerpc;power;g; s;.*powerpc.*;power;g;
s;PowerMacintosh;power;g; s;.*PowerMacintosh.*;power;g;
s;macppc;power;g; s;.*macppc.*;power;g;
s;ppc64;power;g; s;.*ppc64.*;power;g;
s;ppc;power;g; s;.*ppc.*;power;g;
'` '`
BIN=$PLAN9/bin BIN=$PLAN9/bin