CVS commit: pkgsrc/mk/compiler

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Jun  8 22:59:53 UTC 2023

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk/compiler/gcc.mk: Missed a spot for TOOLS_USE_CROSS_COMPILE.

Fixes build of tool dependencies like m4 of cross-libtool-base from a
clean tree with no packages; I must have already had m4 built when I
used this before.


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 pkgsrc/mk/compiler/gcc.mk

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

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.249 pkgsrc/mk/compiler/gcc.mk:1.250
--- pkgsrc/mk/compiler/gcc.mk:1.249     Fri Jan  6 23:11:31 2023
+++ pkgsrc/mk/compiler/gcc.mk   Thu Jun  8 22:59:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.249 2023/01/06 23:11:31 wiz Exp $
+# $NetBSD: gcc.mk,v 1.250 2023/06/08 22:59:53 riastradh Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -62,7 +62,7 @@ _VARGROUPS+=  gcc
 _USER_VARS.gcc=        \
        USE_NATIVE_GCC USE_PKGSRC_GCC USE_PKGSRC_GCC_RUNTIME \
        GCCBASE GCC_VERSION_SUFFIX \
-       USE_CROSS_COMPILE \
+       TOOLS_USE_CROSS_COMPILE \
        PKGSRC_USE_FORTIFY PKGSRC_USE_RELRO PKGSRC_USE_SSP \
        COMPILER_USE_SYMLINKS CC
 _PKG_VARS.gcc= \
@@ -201,7 +201,7 @@ _CC:=       ${_dir_}/${CC:[1]}
 .      endif
 .    endif
 .  endfor
-.  if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.  if ${TOOLS_USE_CROSS_COMPILE:tl} == "no"
 # Pass along _CC only if we're working on native packages -- don't pass
 # the cross-compiler on to submakes for building native packages.
 MAKEFLAGS+=    _CC=${_CC:Q}