Page MenuHomeFreeBSD
Files F145599957

D23031.id66339.diff
No OneTemporary
Actions

D23031.id66339.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -491,15 +491,13 @@
# honor that most of all.
#
_OBSOLETE_GCC_TARGETS=mips sparc64
-.if defined(MAKE_OBSOLETE_GCC)
-_OBSOLETE_GCC_TARGETS+=powerpc
-.endif
-TARGETS?=amd64 arm arm64 i386 riscv ${_OBSOLETE_GCC_TARGETS}
+TARGETS?=amd64 arm arm64 i386 powerpc riscv ${_OBSOLETE_GCC_TARGETS}
_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_powerpc?= powerpc powerpc64 powerpcspe
+# powerpcspe excluded until clang fixed
+TARGET_ARCHES_powerpc?= powerpc powerpc64
# riscv64sf excluded due to PR 232085
TARGET_ARCHES_riscv?= riscv64
.for target in ${TARGETS}
@@ -510,12 +508,10 @@
.if !defined(MAKE_OBSOLETE_GCC)
OBSOLETE_GCC_TARGETS=${_OBSOLETE_GCC_TARGETS}
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-gcc6
-TOOLCHAINS_powerpc= powerpc64-gcc6
TOOLCHAINS_riscv= riscv64-gcc
TOOLCHAINS_sparc64= sparc64-gcc6
@@ -724,7 +720,7 @@
.if empty(TARGET_ARCH_${kernel})
.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old."
.endif
-universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
+universe_kernconfs_${TARGET_ARCH_${kernel}}: universe_kernconf_${TARGET}_${kernel}
universe_kernconf_${TARGET}_${kernel}: .MAKE
@echo ">> ${TARGET}.${TARGET_ARCH_${kernel}} ${kernel} kernel started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
@@ -737,6 +733,9 @@
(echo "${TARGET} ${kernel} kernel failed," \
"check _.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
@echo ">> ${TARGET}.${TARGET_ARCH_${kernel}} ${kernel} kernel completed on `LC_ALL=C date`"
+.endfor
+.for target_arch in ${TARGET_ARCHES_${TARGET}}
+universe_kernconfs: universe_kernconfs_${target_arch} .PHONY
.endfor
.endif # make(universe_kernels)
universe: universe_epilogue

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 23, 12:40 AM (13 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28947278
Default Alt Text
D23031.id66339.diff (2 KB)

Event Timeline