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

"Normalise" MKOBJDIRS MKUPDATE MKUNPRIVED with getmakevar() before

Browse Source 
trying to use them internally to build.sh.
Fixes issue where build.sh would run "make cleandir" if MKUPDATE=yes was
set in mk.conf and -u wasn't given to build.sh.
This commit is contained in:
lukem 2003-10-26 02:00:37 +00:00
parent 6c22027ca8
commit 371e58334b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -1,5 +1,5 @@
#! /usr/bin/env sh #! /usr/bin/env sh
# $NetBSD: build.sh,v 1.119 2003/10/25 03:46:09 lukem Exp $ # $NetBSD: build.sh,v 1.120 2003/10/26 02:00:37 lukem Exp $
# #
# Copyright (c) 2001-2003 The NetBSD Foundation, Inc. # Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
# All rights reserved. # All rights reserved.
@ -703,6 +703,14 @@ validatemakeparams()
exit 1 exit 1
fi fi
# Normalise MKOBJDIRS, MKUNPRIVED, and MKUPDATE
# These may be set as build.sh options or in "mk.conf".
# Don't export them as they're only used for tests in build.sh.
#
MKOBJDIRS=$(getmakevar MKOBJDIRS)
MKUNPRIVED=$(getmakevar MKUNPRIVED)
MKUPDATE=$(getmakevar MKUPDATE)
if [ "${MKOBJDIRS}" != "no" ]; then if [ "${MKOBJDIRS}" != "no" ]; then
# If setting -M or -O to the root of an obj dir, make sure # If setting -M or -O to the root of an obj dir, make sure
# the base directory is made before continuing as <bsd.own.mk> # the base directory is made before continuing as <bsd.own.mk>
@ -826,7 +834,7 @@ createmakewrapper()
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.119 2003/10/25 03:46:09 lukem Exp $ # Generated from: \$NetBSD: build.sh,v 1.120 2003/10/26 02:00:37 lukem Exp $
# #
EOF EOF