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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/build.sh,v
rcsdiff: /ftp/cvs/cvsroot/src/build.sh,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- src/build.sh	2007/10/17 23:23:02	1.176
+++ src/build.sh	2007/11/20 01:30:07	1.177
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.176 2007/10/17 23:23:02 garbled Exp $
+#	$NetBSD: build.sh,v 1.177 2007/11/20 01:30:07 uebayasi Exp $
 #
 # Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1096,21 +1096,26 @@ 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.176 2007/10/17 23:23:02 garbled Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.177 2007/11/20 01:30:07 uebayasi Exp $
 # with these arguments: ${_args}
 #
+
 EOF
-	for f in ${makeenv}; do
-		if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then
-			eval echo "unset ${f}" ${makewrapout}
-		else
-			eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}" ${makewrapout}
-		fi
-	done
+	{
+		for f in ${makeenv}; do
+			if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then
+				eval echo "unset ${f}"
+			else
+				eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}"
+			fi
+		done
 
-	eval cat <<EOF ${makewrapout}
+		eval cat <<EOF
 MAKEWRAPPERMACHINE=${makewrappermachine:-${MACHINE}}; export MAKEWRAPPERMACHINE
 USETOOLS=yes; export USETOOLS
+EOF
+	} | eval sort -u "${makewrapout}"
+		eval cat <<EOF "${makewrapout}"
 
 exec "\${TOOLDIR}/bin/${toolprefix}make" \${1+"\$@"}
 EOF