CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jul  9 15:45:46 UTC 2019

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

Log Message:
Avoid passing _CC as cross-compiler to recursive makes.

This way we don't inadvertently tell a native dependency that it is
supposed to be compiled with the cross-compiler.

No functional change intended for USE_CROSS_COMPILE=no.


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 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.198 pkgsrc/mk/compiler/gcc.mk:1.199
--- pkgsrc/mk/compiler/gcc.mk:1.198     Mon Nov 12 14:22:58 2018
+++ pkgsrc/mk/compiler/gcc.mk   Tue Jul  9 15:45:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.198 2018/11/12 14:22:58 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.199 2019/07/09 15:45:46 riastradh Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -161,7 +161,11 @@ _CC:=      ${_dir_}/${CC:C/^/_asdf_/1:M_asdf_
 .      endif
 .    endif
 .  endfor
+.  if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+# 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}
+.  endif
 .endif
 
 .if !defined(_GCC_VERSION)