[pkgsrc/trunk]: pkgsrc/mk compiler.mk uses the following tools to compute the...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19df05d2b22b
branches:  trunk
changeset: 493762:19df05d2b22b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat May 14 06:04:44 2005 +0000

description:
compiler.mk uses the following tools to compute the values of variables
at the time that they're defined: ${AWK}, ${GREP}, ${SED}, ${TRUE}.
Move the inclusion of compiler.mk below the inclusion of bsd.tools.mk
so that these variables are properly defined by the time they are
used.  This should fix problems where pkgsrc gcc was not being properly
detected when using the new tools framework.

This change has the side effect of changing the relative order of the
compiler directories and the tool directory in the PATH, but this has
no impact on existing packages, and actually makes more sense anyway.

diffstat:

 mk/bsd.pkg.mk |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (43 lines):

diff -r 57a5ee3e8d70 -r 19df05d2b22b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat May 14 05:57:43 2005 +0000
+++ b/mk/bsd.pkg.mk     Sat May 14 06:04:44 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1648 2005/05/14 04:26:15 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1649 2005/05/14 06:04:44 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -926,16 +926,6 @@
 ALL_ENV+=              PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 BUILD_DEFS+=           PKG_SYSCONFBASEDIR PKG_SYSCONFDIR
 
-# If NO_BUILD is defined, default to not needing a compiler.
-.if defined(NO_BUILD)
-USE_LANGUAGES?=                # empty
-.endif
-
-# Get the proper dependencies and set the PATH to use the compiler
-# named in PKGSRC_COMPILER.
-#
-.include "../../mk/compiler.mk"
-
 # These are all of the tools use by pkgsrc Makefiles.  This should
 # eventually be split up into lists of tools required by different
 # phases of a pkgsrc build.
@@ -966,6 +956,16 @@
 .include "../../mk/tools.mk"
 .endif
 
+# If NO_BUILD is defined, default to not needing a compiler.
+.if defined(NO_BUILD)
+USE_LANGUAGES?=                # empty
+.endif
+
+# Get the proper dependencies and set the PATH to use the compiler
+# named in PKGSRC_COMPILER.
+#
+.include "../../mk/compiler.mk"
+
 .include "../../mk/wrapper/bsd.wrapper.mk"
 
 .if defined(RECOMMENDED)