Source-Changes-HG archive

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

[src/trunk]: src/tools/host-mkdep Use a CONFIGURE_ENV variable instead of in-...



details:   https://anonhg.NetBSD.org/src/rev/4b8a5b2538a0
branches:  trunk
changeset: 783039:4b8a5b2538a0
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Dec 02 12:21:51 2012 +0000

description:
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.

diffstat:

 tools/host-mkdep/Makefile |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r d324bc204da1 -r 4b8a5b2538a0 tools/host-mkdep/Makefile
--- a/tools/host-mkdep/Makefile Sun Dec 02 12:19:34 2012 +0000
+++ b/tools/host-mkdep/Makefile Sun Dec 02 12:21:51 2012 +0000
@@ -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 @@
 
 .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.



Home | Main Index | Thread Index | Old Index