Module Name:    src
Committed By:   apb
Date:           Sun Dec  2 12:21:51 UTC 2012

Modified Files:
        src/tools/host-mkdep: Makefile

Log Message:
Use a CONFIGURE_ENV variable instead of in-line code for passing
environment variables to the confifure script for host-mkdep.
Also reword the comment about why TOOL_AWK can't be included.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tools/host-mkdep/Makefile

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

Modified files:

Index: src/tools/host-mkdep/Makefile
diff -u src/tools/host-mkdep/Makefile:1.10 src/tools/host-mkdep/Makefile:1.11
--- src/tools/host-mkdep/Makefile:1.10	Sun Oct 19 22:05:23 2008
+++ src/tools/host-mkdep/Makefile	Sun Dec  2 12:21:51 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2008/10/19 22:05:23 apb Exp $
+#	$NetBSD: Makefile,v 1.11 2012/12/02 12:21:51 apb Exp $
 
 TIMESTAMP=	${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
 
@@ -6,14 +6,18 @@ CLEANFILES+=	config.cache config.log con
 
 .include <bsd.hostprog.mk>
 
-# When host-mkdep is built, TOOL_AWK is not yet available, so we do not
-# pass AWK=${TOOL_AWK:Q} to configure; we allow configure to find awk
-# for itself (or complain if it can't find awk).
+# XXX: The configure script needs to use awk, but we can't pass
+# AWK=${TOOL_AWK:Q} in CONFIGURE_ENV, because TOOL_AWK is not yet
+# available at the time that host-mkdep is built.  The configure script
+# will try to find some other version of awk.
+#
+CONFIGURE_ENV=	CC=${HOST_CC:Q}
 
 realall: host-mkdep
 host-mkdep: configure host-mkdep.in
 	-rm -f $@
-	CC=${HOST_CC:Q} ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
+	${CONFIGURE_ENV} \
+	    ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
 	chmod +x $@
 
 # This is the only program that comes before binstall.

Reply via email to