commit 6f5bd96ed836ad26b9c4ab6ad9ecc81e28622736
from: Neven Sajko <nsajko@gmail.com>
via: Dan Cross <crossd@gmail.com>
date: Tue Jan 07 19:49:26 2020 UTC

all: sync and dedup the creation of the SYSNAME and OBJTYPE env vars (#321)

This should prevent the issues of dist/buildmk and src/mkhdr getting out
of synchronization yet again.

I also add a rule for arm64 to the OBJTYPE sed command.

Fixes #243
Fixes #320

Change-Id: I60f69a1f32b5ed5ae5ac8a1659c38e29debed005

commit - f264bbcdf6da8ea784cf1342b9583d34944fef0c
commit + 6f5bd96ed836ad26b9c4ab6ad9ecc81e28622736
blob - /dev/null
blob + f6de1e350da223380cffaae5f49e182acf1ad104 (mode 644)
--- /dev/null
+++ buildEnvironmentVariables
@@ -0,0 +1,19 @@
+SYSNAME=`uname`
+OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | 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;.*Power.Macintosh.*;power;g;
+	s;.*macppc.*;power;g;
+	s;.*mips.*;mips;g;
+	s;.*ppc64.*;power;g;
+	s;.*ppc.*;power;g;
+	s;.*alpha.*;alpha;g;
+	s;.*sun4u.*;sun4u;g;
+	s;.*aarch64.*;arm64;
+	s;.*arm64.*;arm64;
+'`
blob - 07b223aca62994330ebf0fc3e0f53ef25dd040e2
blob + 6be4ba50fb28461d06e76ac5034bb4f7a0fbd35f
--- dist/buildmk
+++ dist/buildmk
@@ -1,21 +1,6 @@
 #!/bin/sh
 
 # run this in the src directory
-SYSNAME=`uname` export SYSNAME
-OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | 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;.*Power.Macintosh.*;power;g;
-	s;.*macppc.*;power;g;
-	s;.*mips.*;mips;g;
-	s;.*ppc64.*;power;g;
-	s;.*ppc.*;power;g;
-	s;.*alpha.*;alpha;g;
-	s;.*sun4u.*;sun4u;g;
-'` export OBJTYPE
+export SYSNAME OBJTYPE
+. ../buildEnvironmentVariables
 sh -x mkmk.sh
blob - 1c3f20af2cf64b57dcd29b2abffa8a99d46f077d
blob + 03447df9339b8974a59482468aaa3fe7cf174eda
--- src/mkhdr
+++ src/mkhdr
@@ -1,22 +1,4 @@
-# if you change this, also edit ../dist/buildmk
-SYSNAME=`uname`
-OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | 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;.*Power.Macintosh.*;power;g;
-	s;.*macppc.*;power;g;
-	s;.*mips.*;mips;g;
-	s;.*ppc64.*;power;g;
-	s;.*ppc.*;power;g;
-	s;.*alpha.*;alpha;g;
-	s;.*sun4u.*;sun4u;g;
-	s;.*aarch64.*;arm64;
-'`
+<$PLAN9/buildEnvironmentVariables
 
 BIN=$PLAN9/bin
 LIBDIR=$PLAN9/lib