Source-Changes-HG archive

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

[src/trunk]: src Fix build.sh "modules" target build which has been broken since



details:   https://anonhg.NetBSD.org/src/rev/6a6f2684c2f0
branches:  trunk
changeset: 781766:6a6f2684c2f0
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Sep 29 04:02:42 2012 +0000

description:
Fix build.sh "modules" target build which has been broken since
do-sys-modules target was removed from src/Makefile in rev 1.299.
Fixes PR/46994.
Also remove a redundant bomb message which is already handled by
make_in_dir().

diffstat:

 build.sh |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r d5a4ff5356ec -r 6a6f2684c2f0 build.sh
--- a/build.sh  Fri Sep 28 20:08:13 2012 +0000
+++ b/build.sh  Sat Sep 29 04:02:42 2012 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.255 2012/08/05 04:39:09 matt Exp $
+#      $NetBSD: build.sh,v 1.256 2012/09/29 04:02:42 tsutsui Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1668,7 +1668,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.255 2012/08/05 04:39:09 matt Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.256 2012/09/29 04:02:42 tsutsui Exp $
 # with these arguments: ${_args}
 #
 
@@ -1819,14 +1819,13 @@
 
        statusmsg "Building kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"
        if [ "${MKOBJDIRS}" != "no" ]; then
-               make_in_dir sys/modules obj ||
-                   bomb "Failed to make obj in sys/modules"
+               make_in_dir sys/modules obj
        fi
        if [ "${MKUPDATE}" = "no" ]; then
                make_in_dir sys/modules cleandir
        fi
-       ${runcmd} "${makewrapper}" ${parallel} do-sys-modules ||
-           bomb "Failed to make do-sys-modules"
+       make_in_dir sys/modules dependall
+       make_in_dir sys/modules install
 
        statusmsg "Successful build of kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"
 }



Home | Main Index | Thread Index | Old Index