From ff4c0e6f83e6a961816534d6304b99c32eded5a8 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 24 Mar 2020 18:16:02 +0000 Subject: [PATCH] Disable rarely used architecture variants in make universe by default. If EXTRA_TARGETS is defined, build all supported architecture variants. By default, build architecture variants needed to provide code coverage or that are commonly used. Use this to disable building of all the hard-float and little-endian MIPS architecture variants along with n32 by default. Reviewed by: rpokala Discussed with: imp, emaste Differential Revision: https://reviews.freebsd.org/D24178 --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7fe45e00043e..f1d2569ad871 100644 --- a/Makefile +++ b/Makefile @@ -483,16 +483,17 @@ worlds: .PHONY .if make(universe) || make(universe_kernels) || make(tinderbox) || \ make(targets) || make(universe-toolchain) # -# Always build architectures supported by clang. Only build architectures -# only supported by GCC if a suitable toolchain is present or enabled. -# In all cases, if the user specifies TARGETS on the command line, -# honor that most of all. +# Don't build rarely used architectures unless requested. # +.if defined(EXTRA_TARGETS) +EXTRA_ARCHES_mips= mipsel mipshf mipselhf mips64el mips64hf mips64elhf +EXTRA_ARCHES_mips+= mipsn32 +.endif TARGETS?=amd64 arm arm64 i386 mips powerpc riscv _UNIVERSE_TARGETS= ${TARGETS} TARGET_ARCHES_arm?= armv6 armv7 TARGET_ARCHES_arm64?= aarch64 -TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf +TARGET_ARCHES_mips?= mips mips64 ${EXTRA_ARCHES_mips} # powerpcspe excluded until clang fixed TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_riscv?= riscv64 riscv64sf