Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src move change from rev 1.232 to the initialization part.



details:   https://anonhg.NetBSD.org/src/rev/e78a5aabac7d
branches:  trunk
changeset: 753487:e78a5aabac7d
user:      cegger <cegger%NetBSD.org@localhost>
date:      Tue Mar 30 13:17:47 2010 +0000

description:
move change from rev 1.232 to the initialization part.
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@

diffstat:

 build.sh |  20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r 45628dc93b5e -r e78a5aabac7d build.sh
--- a/build.sh  Tue Mar 30 07:59:15 2010 +0000
+++ b/build.sh  Tue Mar 30 13:17:47 2010 +0000
@@ -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 @@
        #
        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 @@
        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 @@
        fi
        KERNCONFDIR="$(getmakevar KERNCONFDIR)"
        KERNOBJDIR="$(getmakevar KERNOBJDIR)"
-       case "${KERNOBJDIR}" in
-       ''|/*)  ;;
-       *)      KERNOBJDIR="${TOP}/${KERNOBJDIR}"
-               setmakeenv KERNOBJDIR "${KERNOBJDIR}"
-               ;;
-       esac
-
        case "${kernelconf}" in
        */*)
                kernelconfpath="${kernelconf}"



Home | Main Index | Thread Index | Old Index