Module Name:    src
Committed By:   apb
Date:           Tue Nov 17 20:49:34 UTC 2009

Modified Files:
        src: build.sh

Log Message:
Set LC_ALL=C before we try to parse the output from any command.
This will ensure that awk is not invoked in a way that tickles
the bug described in PR 42320.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/build.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/build.sh
diff -u src/build.sh:1.217 src/build.sh:1.218
--- src/build.sh:1.217	Wed Nov  4 12:58:01 2009
+++ src/build.sh	Tue Nov 17 20:49:34 2009
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.217 2009/11/04 12:58:01 apb Exp $
+#	$NetBSD: build.sh,v 1.218 2009/11/17 20:49:34 apb Exp $
 #
 # Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -163,6 +163,9 @@
 	[ -f share/mk/bsd.own.mk ] ||
 	    bomb "src/share/mk is missing; please re-fetch the source tree"
 
+	# Set LC_ALL=C before we try to parse the output from any command
+	setmakeenv LC_ALL C
+
 	# Find information about the build platform.  This should be
 	# kept in sync with _HOST_OSNAME, _HOST_OSREL, and _HOST_ARCH
 	# variables in share/mk/bsd.sys.mk.
@@ -272,7 +275,6 @@
 	#
 	unsetmakeenv INFODIR
 	unsetmakeenv LESSCHARSET
-	setmakeenv LC_ALL C
 }
 
 getarch()
@@ -1315,7 +1317,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.217 2009/11/04 12:58:01 apb Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.218 2009/11/17 20:49:34 apb Exp $
 # with these arguments: ${_args}
 #
 

Reply via email to