d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for using GCC 4.2.1 from make tinderbox.

Browse Source 
Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D23054
This commit is contained in:
John Baldwin 2020-01-07 16:53:51 +00:00
parent 958ff217e7
commit 57496d6c2d
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -6,9 +6,7 @@
# universe - *Really* build *everything* (buildworld and # universe - *Really* build *everything* (buildworld and
# all kernels on all architectures). Define # all kernels on all architectures). Define
# MAKE_JUST_KERNELS to only build kernels, # MAKE_JUST_KERNELS to only build kernels,
# MAKE_JUST_WORLDS to only build userland, and/or # MAKE_JUST_WORLDS to only build userland.
# MAKE_OBSOLETE_GCC to also build architectures
# unsupported by clang using in-tree gcc.
# tinderbox - Same as universe, but presents a list of failed build # tinderbox - Same as universe, but presents a list of failed build
# targets and exits with an error if there were any. # targets and exits with an error if there were any.
# buildworld - Rebuild *everything*, including glue to help do # buildworld - Rebuild *everything*, including glue to help do
@ -490,8 +488,7 @@ worlds: .PHONY
# In all cases, if the user specifies TARGETS on the command line, # In all cases, if the user specifies TARGETS on the command line,
# honor that most of all. # honor that most of all.
# #
_OBSOLETE_GCC_TARGETS=mips sparc64 TARGETS?=amd64 arm arm64 i386 mips powerpc riscv sparc64
TARGETS?=amd64 arm arm64 i386 powerpc riscv ${_OBSOLETE_GCC_TARGETS}
_UNIVERSE_TARGETS= ${TARGETS} _UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?= armv6 armv7 TARGET_ARCHES_arm?= armv6 armv7
TARGET_ARCHES_arm64?= aarch64 TARGET_ARCHES_arm64?= aarch64
@ -505,21 +502,16 @@ TARGET_ARCHES_${target}?= ${target}
.endfor .endfor
MAKE_PARAMS_riscv?= CROSS_TOOLCHAIN=riscv64-gcc MAKE_PARAMS_riscv?= CROSS_TOOLCHAIN=riscv64-gcc
.if !defined(MAKE_OBSOLETE_GCC)
OBSOLETE_GCC_TARGETS=${_OBSOLETE_GCC_TARGETS}
MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc6 MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc6
MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc6 MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc6
.endif
TOOLCHAINS_mips= mips-gcc6 TOOLCHAINS_mips= mips-gcc6
TOOLCHAINS_riscv= riscv64-gcc TOOLCHAINS_riscv= riscv64-gcc
TOOLCHAINS_sparc64= sparc64-gcc6 TOOLCHAINS_sparc64= sparc64-gcc6
# Remove architectures only supported by external toolchain from # Remove architectures only supported by external toolchain from
# universe if required toolchain packages are missing. riscv requires # universe if required toolchain packages are missing.
# an out-of-tree toolchain. When MAKE_OBSOLETE_GCC is not defined, .for target in mips riscv sparc64
# the same logic appleis to the obsolete gcc targets.
.for target in riscv ${OBSOLETE_GCC_TARGETS}
.if ${_UNIVERSE_TARGETS:M${target}} .if ${_UNIVERSE_TARGETS:M${target}}
.for toolchain in ${TOOLCHAINS_${target}} .for toolchain in ${TOOLCHAINS_${target}}
.if !exists(/usr/local/share/toolchains/${toolchain}.mk) .if !exists(/usr/local/share/toolchains/${toolchain}.mk)