Received: by mail.netbsd.org (Postfix, from userid 605) id 109CE84DD9; Tue, 9 Jul 2019 15:45:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8D43D84D5A for ; Tue, 9 Jul 2019 15:45:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id QfQutNyeJDCb for ; Tue, 9 Jul 2019 15:45:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DD39384CD5 for ; Tue, 9 Jul 2019 15:45:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DB2E7FBF4; Tue, 9 Jul 2019 15:45:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1562687146111770" MIME-Version: 1.0 Date: Tue, 9 Jul 2019 15:45:46 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/mk/compiler To: pkgsrc-changes@NetBSD.org Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20190709154546.DB2E7FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1562687146111770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1562687146111770 Content-Disposition: inline Content-Length: 812 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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) --_----------=_1562687146111770--