aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile16
1 files changed, 4 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index bd690288ec5a..f02e88632dd1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,7 @@
# universe - *Really* build *everything* (buildworld and
# all kernels on all architectures). Define
# MAKE_JUST_KERNELS to only build kernels,
-# MAKE_JUST_WORLDS to only build userland, and/or
-# MAKE_OBSOLETE_GCC to also build architectures
-# unsupported by clang using in-tree gcc.
+# MAKE_JUST_WORLDS to only build userland.
# tinderbox - Same as universe, but presents a list of failed build
# targets and exits with an error if there were any.
# 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,
# honor that most of all.
#
-_OBSOLETE_GCC_TARGETS=mips sparc64
-TARGETS?=amd64 arm arm64 i386 powerpc riscv ${_OBSOLETE_GCC_TARGETS}
+TARGETS?=amd64 arm arm64 i386 mips powerpc riscv sparc64
_UNIVERSE_TARGETS= ${TARGETS}
TARGET_ARCHES_arm?= armv6 armv7
TARGET_ARCHES_arm64?= aarch64
@@ -505,21 +502,16 @@ TARGET_ARCHES_${target}?= ${target}
.endfor
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_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc6
-.endif
TOOLCHAINS_mips= mips-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
-# an out-of-tree toolchain. When MAKE_OBSOLETE_GCC is not defined,
-# the same logic appleis to the obsolete gcc targets.
-.for target in riscv ${OBSOLETE_GCC_TARGETS}
+# universe if required toolchain packages are missing.
+.for target in mips riscv sparc64
.if ${_UNIVERSE_TARGETS:M${target}}
.for toolchain in ${TOOLCHAINS_${target}}
.if !exists(/usr/local/share/toolchains/${toolchain}.mk)