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
This commit is contained in:
parent
a4980b3957
commit
9f8b1dc7fa
2 changed files with 22 additions and 23 deletions
23
dist/buildmk
vendored
23
dist/buildmk
vendored
|
|
@ -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
|
||||
|
||||
|
|
|
|||
22
src/mkhdr
22
src/mkhdr
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue