Commit Diff

Commit:
9bea9069bf3bc282c6b7d129926d4a0f1b40c66b
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
buildmk: sync $OBJTYPE with src/mkhdr fixes #4 http://bitbucket.org/rsc/plan9port/issue/4 http://codereview.appspot.com/95042
Actions:
Patch | Tree
commit - cb92a1b41c1e5bd0686866c123304df47e8cca6a
commit + 9bea9069bf3bc282c6b7d129926d4a0f1b40c66b
blob - ae4157624736f04b49d63f29d040bda0bd263a2f
blob + 2fe14ccf6723e6e1d8357a813685a73ac9e40ca4
--- dist/buildmk
+++ 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
 
blob - 8c452f42dddab837f0e4402c712d090fb8b1849f
blob + 1fc37ebdab2d752fd6a304e7f730a5bd70ed33a4
--- src/mkhdr
+++ 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