cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Neven Sajko 2020-01-07 20:49:26 +01:00 committed by Dan Cross
parent f264bbcdf6
commit 6f5bd96ed8
3 changed files with 22 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
buildEnvironmentVariables Normal file
View file

@ -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;
'`

19
dist/buildmk vendored
View file

@ -1,21 +1,6 @@
#!/bin/sh #!/bin/sh
# run this in the src directory # run this in the src directory
SYSNAME=`uname` export SYSNAME export SYSNAME OBJTYPE
OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed ' . ../buildEnvironmentVariables
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
sh -x mkmk.sh sh -x mkmk.sh

20
src/mkhdr
View file

@ -1,22 +1,4 @@
# if you change this, also edit ../dist/buildmk <$PLAN9/buildEnvironmentVariables
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;
'`
BIN=$PLAN9/bin BIN=$PLAN9/bin
LIBDIR=$PLAN9/lib LIBDIR=$PLAN9/lib