Sun May 9 18:53:03 2010 UTC ()
Don't try to build xldscripts during build.sh modules


(morr)
diff -r1.233 -r1.234 src/build.sh
cvs diff -r1.233 -r1.234 src/build.sh (expand / switch to unified diff)

--- src/build.sh 2010/03/30 13:17:47 1.233
+++ src/build.sh 2010/05/09 18:53:03 1.234
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! /usr/bin/env sh 1#! /usr/bin/env sh
2# $NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $ 2# $NetBSD: build.sh,v 1.234 2010/05/09 18:53:03 morr Exp $
3# 3#
4# Copyright (c) 2001-2009 The NetBSD Foundation, Inc. 4# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code is derived from software contributed to The NetBSD Foundation 7# This code is derived from software contributed to The NetBSD Foundation
8# by Todd Vierling and Luke Mewburn. 8# by Todd Vierling and Luke Mewburn.
9# 9#
10# Redistribution and use in source and binary forms, with or without 10# Redistribution and use in source and binary forms, with or without
11# modification, are permitted provided that the following conditions 11# modification, are permitted provided that the following conditions
12# are met: 12# are met:
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -1351,27 +1351,27 @@ createmakewrapper() @@ -1351,27 +1351,27 @@ createmakewrapper()
1351 else 1351 else
1352 makewrapout=">>\${makewrapper}" 1352 makewrapout=">>\${makewrapper}"
1353 fi 1353 fi
1354 1354
1355 case "${KSH_VERSION:-${SH_VERSION}}" in 1355 case "${KSH_VERSION:-${SH_VERSION}}" in
1356 *PD\ KSH*|*MIRBSD\ KSH*) 1356 *PD\ KSH*|*MIRBSD\ KSH*)
1357 set +o braceexpand 1357 set +o braceexpand
1358 ;; 1358 ;;
1359 esac 1359 esac
1360 1360
1361 eval cat <<EOF ${makewrapout} 1361 eval cat <<EOF ${makewrapout}
1362#! ${HOST_SH} 1362#! ${HOST_SH}
1363# Set proper variables to allow easy "make" building of a NetBSD subtree. 1363# Set proper variables to allow easy "make" building of a NetBSD subtree.
1364# Generated from: \$NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $ 1364# Generated from: \$NetBSD: build.sh,v 1.234 2010/05/09 18:53:03 morr Exp $
1365# with these arguments: ${_args} 1365# with these arguments: ${_args}
1366# 1366#
1367 1367
1368EOF 1368EOF
1369 { 1369 {
1370 for f in ${makeenv}; do 1370 for f in ${makeenv}; do
1371 if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then 1371 if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then
1372 eval echo "unset ${f}" 1372 eval echo "unset ${f}"
1373 else 1373 else
1374 eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}" 1374 eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}"
1375 fi 1375 fi
1376 done 1376 done
1377 1377
@@ -1492,26 +1492,27 @@ releasekernel() @@ -1492,26 +1492,27 @@ releasekernel()
1492 [ -f "${builtkern}" ] || continue 1492 [ -f "${builtkern}" ] || continue
1493 releasekern="${kernelreldir}/${kern}-${kernelconfname}.gz" 1493 releasekern="${kernelreldir}/${kern}-${kernelconfname}.gz"
1494 statusmsg "Kernel copy: ${releasekern}" 1494 statusmsg "Kernel copy: ${releasekern}"
1495 if [ "${runcmd}" = "echo" ]; then 1495 if [ "${runcmd}" = "echo" ]; then
1496 echo "gzip -c -9 < ${builtkern} > ${releasekern}" 1496 echo "gzip -c -9 < ${builtkern} > ${releasekern}"
1497 else 1497 else
1498 gzip -c -9 < "${builtkern}" > "${releasekern}" 1498 gzip -c -9 < "${builtkern}" > "${releasekern}"
1499 fi 1499 fi
1500 done 1500 done
1501} 1501}
1502 1502
1503buildmodules() 1503buildmodules()
1504{ 1504{
 1505 setmakeenv MKBINUTILS no
1505 if ! ${do_tools} && ! ${buildmoduleswarned:-false}; then 1506 if ! ${do_tools} && ! ${buildmoduleswarned:-false}; then
1506 # Building tools every time we build modules is clearly 1507 # Building tools every time we build modules is clearly
1507 # unnecessary as well as a kernel. 1508 # unnecessary as well as a kernel.
1508 # 1509 #
1509 statusmsg "Building modules without building new tools" 1510 statusmsg "Building modules without building new tools"
1510 buildmoduleswarned=true 1511 buildmoduleswarned=true
1511 fi 1512 fi
1512 1513
1513 statusmsg "Building kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}" 1514 statusmsg "Building kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"
1514 if [ "${MKOBJDIRS}" != "no" ]; then 1515 if [ "${MKOBJDIRS}" != "no" ]; then
1515 make_in_dir sys/modules obj || 1516 make_in_dir sys/modules obj ||
1516 bomb "Failed to make obj in sys/modules" 1517 bomb "Failed to make obj in sys/modules"
1517 fi 1518 fi