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

Broaden the scope of when "make obj NOSUBDIR=" will be run in tools/ 

to be at any time that build.sh is run without -o, because we need
the objdir of the top-level to exist if build.sh is going to provide
a default DESTDIR/RELEASEDIR, and with the previous code, if
MAKEOBJDIRPREFIX was used and the objdir of the source tree didn't
exist, build.sh would incorrectly determine the DESTDIR.
(mmm, obscure bugs).
This commit is contained in:
lukem 2003-05-26 06:35:17 +00:00
parent 9ece9fecbc
commit ccfdea7ffb
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build.sh
View File

@ -1,5 +1,5 @@
#! /usr/bin/env sh
# $NetBSD: build.sh,v 1.105 2003/05/25 12:34:27 lukem Exp $
# $NetBSD: build.sh,v 1.106 2003/05/26 06:35:17 lukem Exp $
#
# Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
# All rights reserved.
@ -667,24 +667,26 @@ validatemakeparams()
exit 1
fi
# If TOOLDIR isn't already set, make objdirs in "tools" in case the
# default setting from <bsd.own.mk> is used.
#
if [ -z "${TOOLDIR}" ] && [ "${MKOBJDIRS}" != "no" ]; then
if [ "${MKOBJDIRS}" != "no" ]; then
# 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>
# will need this to pick up _SRC_TOP_OBJ_
#
if [ ! -z "${makeobjdir}" ]; then
${runcmd} mkdir -p "${makeobjdir}"
fi
# make obj in tools to ensure that the objdir for the top-level
# of the source tree and for "tools" is available, in case the
# default TOOLDIR setting from <bsd.own.mk> is used, or the
# build.sh default DESTDIR and RELEASEDIR is to be used.
#
${runcmd} cd tools
${runcmd} "${make}" -m ${TOP}/share/mk obj NOSUBDIR= ||
bomb "Failed to make obj in tools"
${runcmd} cd "${TOP}"
fi
# If setting -M or -O to root an obj dir make sure the base directory
# is made before continuing as bsd.own.mk will need this to pick up
# _SRC_TOP_OBJ_
#
if [ "${MKOBJDIRS}" != "no" ] && [ ! -z "${makeobjdir}" ]; then
${runcmd} mkdir -p "${makeobjdir}"
fi
statusmsg "MACHINE: ${MACHINE}"
statusmsg "MACHINE_ARCH: ${MACHINE_ARCH}"
@ -788,7 +790,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! /bin/sh
# Set proper variables to allow easy "make" building of a NetBSD subtree.
# Generated from: \$NetBSD: build.sh,v 1.105 2003/05/25 12:34:27 lukem Exp $
# Generated from: \$NetBSD: build.sh,v 1.106 2003/05/26 06:35:17 lukem Exp $
#
EOF