From owner-svn-src-head@freebsd.org Sat Jan 4 00:59:48 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94EC71D868C; Sat, 4 Jan 2020 00:59:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47qNj03CNTz4ZZT; Sat, 4 Jan 2020 00:59:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50C534EEE; Sat, 4 Jan 2020 00:59:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0040xmpw063383; Sat, 4 Jan 2020 00:59:48 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0040xmcl063382; Sat, 4 Jan 2020 00:59:48 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202001040059.0040xmcl063382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sat, 4 Jan 2020 00:59:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356344 - head X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 356344 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2020 00:59:48 -0000 Author: jhb Date: Sat Jan 4 00:59:47 2020 New Revision: 356344 URL: https://svnweb.freebsd.org/changeset/base/356344 Log: Use the freebsd-gcc6 toolchains instead of powerpc64-xtoolchain-gcc. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D23029 Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sat Jan 4 00:51:03 2020 (r356343) +++ head/Makefile Sat Jan 4 00:59:47 2020 (r356344) @@ -509,15 +509,15 @@ TARGET_ARCHES_${target}?= ${target} MAKE_PARAMS_riscv?= CROSS_TOOLCHAIN=riscv64-gcc .if !defined(MAKE_OBSOLETE_GCC) OBSOLETE_GCC_TARGETS=${_OBSOLETE_GCC_TARGETS} -MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc -MAKE_PARAMS_powerpc?= CROSS_TOOLCHAIN=powerpc64-gcc -MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc +MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc6 +MAKE_PARAMS_powerpc?= CROSS_TOOLCHAIN=powerpc64-gcc6 +MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc6 .endif -TOOLCHAINS_mips= mips -TOOLCHAINS_powerpc= powerpc64 -TOOLCHAINS_riscv= riscv64 -TOOLCHAINS_sparc64= sparc64 +TOOLCHAINS_mips= mips-gcc6 +TOOLCHAINS_powerpc= powerpc64-gcc6 +TOOLCHAINS_riscv= riscv64-gcc +TOOLCHAINS_sparc64= sparc64-gcc6 # Remove architectures only supported by external toolchain from # universe if required toolchain packages are missing. riscv requires @@ -526,12 +526,12 @@ TOOLCHAINS_sparc64= sparc64 .for target in riscv ${OBSOLETE_GCC_TARGETS} .if ${_UNIVERSE_TARGETS:M${target}} .for toolchain in ${TOOLCHAINS_${target}} -.if !exists(/usr/local/share/toolchains/${toolchain}-gcc.mk) +.if !exists(/usr/local/share/toolchains/${toolchain}.mk) _UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:N${target}} universe: universe_${toolchain}_skip .PHONY universe_epilogue: universe_${toolchain}_skip .PHONY universe_${toolchain}_skip: universe_prologue .PHONY - @echo ">> ${target} skipped - install ${toolchain}-xtoolchain-gcc port or package to build" + @echo ">> ${target} skipped - install ${toolchain} port or package to build" .endif .endfor .endif