From 6f5bd96ed836ad26b9c4ab6ad9ecc81e28622736 Mon Sep 17 00:00:00 2001 From: Neven Sajko Date: Tue, 7 Jan 2020 20:49:26 +0100 Subject: 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 --- dist/buildmk | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'dist') diff --git a/dist/buildmk b/dist/buildmk index 07b223ac..6be4ba50 100755 --- a/dist/buildmk +++ b/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 -- cgit v1.2.3