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

move change from rev 1.232 to the initialization part.

Browse Source 
This fixes the problem 'nbconfig: cannot create /GENERIC'
when KERNOBJDIR has a relative path and is defined as env variable.
Problem reported and fix proposed on tech-toolchain@.

'commit it then' christos@
This commit is contained in:
cegger 2010-03-30 13:17:47 +00:00
parent 2a30f61dd7
commit 4e1acfb483
1 changed files with 11 additions and 9 deletions

20
build.sh

@ -1,5 +1,5 @@
#! /usr/bin/env sh
# $NetBSD: build.sh,v 1.232 2010/03/26 18:02:14 christos Exp $
# $NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@ -259,6 +259,15 @@ initdefaults()
#
setmakeenv NETBSDSRCDIR "${TOP}"
# Make sure KERNOBJDIR is an absolute path if defined
#
case "${KERNOBJDIR}" in
''|/*) ;;
*) KERNOBJDIR="${TOP}/${KERNOBJDIR}"
setmakeenv KERNOBJDIR "${KERNOBJDIR}"
;;
esac
# Find the version of NetBSD
#
DISTRIBVER="$(${HOST_SH} ${TOP}/sys/conf/osrelease.sh)"
@ -1352,7 +1361,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
# Generated from: \$NetBSD: build.sh,v 1.232 2010/03/26 18:02:14 christos Exp $
# Generated from: \$NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $
# with these arguments: ${_args}
#
@ -1421,13 +1430,6 @@ getkernelconf()
fi
KERNCONFDIR="$(getmakevar KERNCONFDIR)"
KERNOBJDIR="$(getmakevar KERNOBJDIR)"
case "${KERNOBJDIR}" in
''|/*) ;;
*) KERNOBJDIR="${TOP}/${KERNOBJDIR}"
setmakeenv KERNOBJDIR "${KERNOBJDIR}"
;;
esac
case "${kernelconf}" in
*/*)
kernelconfpath="${kernelconf}"