aboutsummaryrefslogtreecommitdiff
path: root/dist/buildmk
diff options
context:
space:
mode:
authorPetter Rodhelind <petter.rodhelind@gmail.com>2020-01-14 11:41:08 +0100
committerPetter Rodhelind <petter.rodhelind@gmail.com>2020-01-14 11:41:08 +0100
commit02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch)
treef053238978479e408a2b83571443e132f30586ab /dist/buildmk
parentc0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff)
parent3d1382b98a502d0c34d5ba2c462396acc515016e (diff)
downloadplan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz
plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2
plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'dist/buildmk')
-rwxr-xr-xdist/buildmk19
1 files changed, 2 insertions, 17 deletions
diff --git a/dist/buildmk b/dist/buildmk
index 07b223ac..c559570c 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
+. ../src/mkenv
+export SYSNAME OBJTYPE
sh -x mkmk.sh