tsrc: mv ../buildEnvironmentVariables mkhdr - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 77a0a5b5194d4441c86de097f2aae297cb75e2c2
(DIR) parent 5aad8f3d6d24ee109ea23514862fa579191cb5e4
(HTM) Author: Russ Cox <rsc@swtch.com>
Date: Thu, 9 Jan 2020 20:08:10 -0500
src: mv ../buildEnvironmentVariables mkhdr
Also note that the file must be valid shell and mk input.
For #321.
Diffstat:
D buildEnvironmentVariables | 19 -------------------
M dist/buildmk | 2 +-
A src/mkenv | 22 ++++++++++++++++++++++
M src/mkhdr | 2 +-
4 files changed, 24 insertions(+), 21 deletions(-)
---
(DIR) diff --git a/buildEnvironmentVariables b/buildEnvironmentVariables
t@@ -1,19 +0,0 @@
-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;
-'`
(DIR) diff --git a/dist/buildmk b/dist/buildmk
t@@ -1,6 +1,6 @@
#!/bin/sh
# run this in the src directory
+. ../src/mkenv
export SYSNAME OBJTYPE
-. ../buildEnvironmentVariables
sh -x mkmk.sh
(DIR) diff --git a/src/mkenv b/src/mkenv
t@@ -0,0 +1,22 @@
+# This file must be valid mk input for mkhdr
+# and also valid shell input for ../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;
+ s;.*arm64.*;arm64;
+'`
(DIR) diff --git a/src/mkhdr b/src/mkhdr
t@@ -1,4 +1,4 @@
-<$PLAN9/buildEnvironmentVariables
+<$PLAN9/src/mkenv
BIN=$PLAN9/bin
LIBDIR=$PLAN9/lib