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

build: use installbsd instead of install on AIX

Browse source 
Even in mkmk.sh.
This commit is contained in:
Russ Cox 2020-05-18 22:46:16 -04:00
parent fa157263c8
commit 6c1235d234
6 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/buildmk vendored
View file

@ -2,5 +2,5 @@
# run this in the src directory # run this in the src directory
. ../src/mkenv . ../src/mkenv
export SYSNAME OBJTYPE export SYSNAME OBJTYPE INSTALL
sh -x mkmk.sh sh -x mkmk.sh

2
src/mk.AIX-power
View file

@ -1,2 +0,0 @@
INSTALL=installbsd

1
src/mkenv
View file

@ -20,3 +20,4 @@ OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed '
s;.*aarch64.*;arm64; s;.*aarch64.*;arm64;
s;.*arm64.*;arm64; s;.*arm64.*;arm64;
'` '`
INSTALL=`[ $(uname) = AIX ] && echo installbsd || echo install`

1
src/mkfile
View file

@ -35,6 +35,7 @@ mkmk.sh:VD:
echo cd .. echo cd ..
done done
) | sed ' ) | sed '
s/'$INSTALL'/$INSTALL/g
s/'$SYSNAME'/$SYSNAME/g s/'$SYSNAME'/$SYSNAME/g
s/'$OBJTYPE'/$OBJTYPE/g s/'$OBJTYPE'/$OBJTYPE/g
s;'$PLAN9';$PLAN9;g s;'$PLAN9';$PLAN9;g

3
src/mkhdr
View file

@ -11,7 +11,6 @@ CC=9c
LD=9l LD=9l
AS=9a AS=9a
AR=9ar AR=9ar
INSTALL=install
CFLAGS= CFLAGS=
LDFLAGS= LDFLAGS=
AFLAGS= AFLAGS=
@ -24,5 +23,3 @@ LIB=
SHORTLIB=9 SHORTLIB=9
<|cat $PLAN9/config 2>/dev/null || true <|cat $PLAN9/config 2>/dev/null || true
<|cat $PLAN9/src/mk.$SYSNAME-$OBJTYPE 2>/dev/null || true

2
src/mkmk.sh
View file

@ -209,5 +209,5 @@ echo cd `pwd`
9c word.c 9c word.c
9c unix.c 9c unix.c
9l -o o.mk arc.o archive.o bufblock.o env.o file.o graph.o job.o lex.o main.o match.o mk.o parse.o recipe.o rc.o rule.o run.o sh.o shell.o shprint.o symtab.o var.o varsub.o word.o unix.o 9l -o o.mk arc.o archive.o bufblock.o env.o file.o graph.o job.o lex.o main.o match.o mk.o parse.o recipe.o rc.o rule.o run.o sh.o shell.o shprint.o symtab.o var.o varsub.o word.o unix.o
install o.mk $PLAN9/bin/mk $INSTALL o.mk $PLAN9/bin/mk
cd .. cd ..