aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2009-07-15 02:40:34 -0400
committerRuss Cox <rsc@swtch.com>2009-07-15 02:40:34 -0400
commit9bea9069bf3bc282c6b7d129926d4a0f1b40c66b (patch)
treef3ffd125c58b193c94ec396078c3d9befcbb91c4
parentcb92a1b41c1e5bd0686866c123304df47e8cca6a (diff)
downloadplan9port-9bea9069bf3bc282c6b7d129926d4a0f1b40c66b.tar.gz
plan9port-9bea9069bf3bc282c6b7d129926d4a0f1b40c66b.tar.bz2
plan9port-9bea9069bf3bc282c6b7d129926d4a0f1b40c66b.zip
buildmk: sync $OBJTYPE with src/mkhdr
fixes #4 http://bitbucket.org/rsc/plan9port/issue/4 http://codereview.appspot.com/95042
-rwxr-xr-xdist/buildmk5
-rw-r--r--src/mkhdr11
2 files changed, 9 insertions, 7 deletions
diff --git a/dist/buildmk b/dist/buildmk
index ae415762..2fe14ccf 100755
--- a/dist/buildmk
+++ b/dist/buildmk
@@ -7,11 +7,12 @@ OBJTYPE=`uname -p | sed '
s;i86pc;386;;
s;amd64;x86_64;;
s;/.*;;; s; ;;g;
- s;armv4l;arm;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;
- '` export OBJTYPE
+'` export OBJTYPE
sh -x mkmk.sh
diff --git a/src/mkhdr b/src/mkhdr
index 8c452f42..1fc37ebd 100644
--- a/src/mkhdr
+++ b/src/mkhdr
@@ -1,16 +1,17 @@
+# if you change this, also edit ../dist/buildmk
SYSNAME=`uname`
-# objtype rules also in Makefile
-OBJTYPE=`uname -m | sed '
+OBJTYPE=`uname -p | sed '
s;i.86;386;;
s;i86pc;386;;
s;amd64;x86_64;;
- s;/.*;;;
- s; ;;g;
+ 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'`
+ s;ppc;power;g;
+'`
BIN=$PLAN9/bin
LIBDIR=$PLAN9/lib