Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure the makes running before the make build rule include

Browse Source 
-m <top dir>/share/mk
This commit is contained in:
jmc 2001-12-03 08:18:00 +00:00
parent 55b9072766
commit b24c81ca0c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# $NetBSD: build.sh,v 1.28 2001/11/30 02:18:13 thorpej Exp $ # $NetBSD: build.sh,v 1.29 2001/12/03 08:18:00 jmc Exp $
# #
# Top level build wrapper, for a system containing no tools. # Top level build wrapper, for a system containing no tools.
# #
@ -15,6 +15,8 @@ bomb () {
} }
[ -d usr.bin/make ] || bomb "build.sh must be run from the top source level" [ -d usr.bin/make ] || bomb "build.sh must be run from the top source level"
TOP=`pwd`
getarch () { getarch () {
# Translate a MACHINE into a default MACHINE_ARCH. # Translate a MACHINE into a default MACHINE_ARCH.
case $MACHINE in case $MACHINE in
@ -56,7 +58,7 @@ getarch () {
} }
getmakevar () { getmakevar () {
cat <<EOF | $make -s -f- _x_ cat <<EOF | $make -m ${TOP}/share/mk -s -f- _x_
_x_: _x_:
echo \${$1} echo \${$1}
.include <bsd.prog.mk> .include <bsd.prog.mk>
@ -245,7 +247,7 @@ fi
# default setting from <bsd.own.mk> is used. # default setting from <bsd.own.mk> is used.
if [ -z "$TOOLDIR" ] && [ "$MKOBJDIRS" != "no" ]; then if [ -z "$TOOLDIR" ] && [ "$MKOBJDIRS" != "no" ]; then
$runcmd cd tools $runcmd cd tools
$runcmd $make obj NOSUBDIR= || exit 1 $runcmd $make -m ${TOP}/share/mk obj NOSUBDIR= || exit 1
$runcmd cd .. $runcmd cd ..
fi fi
@ -323,7 +325,7 @@ fi
eval cat <<EOF $makewrapout eval cat <<EOF $makewrapout
#! /bin/sh #! /bin/sh
# Set proper variables to allow easy "make" building of a NetBSD subtree. # Set proper variables to allow easy "make" building of a NetBSD subtree.
# Generated from: \$NetBSD: build.sh,v 1.28 2001/11/30 02:18:13 thorpej Exp $ # Generated from: \$NetBSD: build.sh,v 1.29 2001/12/03 08:18:00 jmc Exp $
# #
EOF EOF