From 9f8b1dc7fa6c53b7340ea5179f3d9e4310cd897d Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Thu, 16 Jul 2009 03:30:22 -0400
Subject: 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
---
 dist/buildmk | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'dist')

diff --git a/dist/buildmk b/dist/buildmk
index 2fe14ccf..cee62ba6 100755
--- a/dist/buildmk
+++ b/dist/buildmk
@@ -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
-
-- 
cgit v1.2.3