Date: Thu, 17 Sep 2015 04:54:50 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287903 - head Message-ID: <201509170454.t8H4soto091872@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Sep 17 04:54:49 2015 New Revision: 287903 URL: https://svnweb.freebsd.org/changeset/base/287903 Log: Rework r287900 to keep arm64/aarch64 stable in the TARGETS list. This is relevant for makeman using the 'make targets' output in src.conf(5). This makes a _UNIVERSE_TARGETS that removes arm64 if the build requirements are not met. Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Thu Sep 17 04:48:15 2015 (r287902) +++ head/Makefile Thu Sep 17 04:54:49 2015 (r287903) @@ -381,26 +381,27 @@ kernel-toolchains: # existing system is. # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) -# XXX Add arm64 to universe only if we have an external binutils installed. -# It does not build with the in-tree linker. Added to lower .for loops too. -.if exists(/usr/local/aarch64-freebsd/bin/ld) -UNIVERSE_arm64=arm64 -.elif empty(${TARGETS}) -universe: universe_arm64_skip -universe_epilogue: universe_arm64_skip -universe_arm64_skip: universe_prologue - @echo ">> arm64 skipped - install aarch64-binutils port or package to build" -.endif -TARGETS?=amd64 arm ${UNIVERSE_arm64} i386 mips pc98 powerpc sparc64 +TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64 +_UNIVERSE_TARGETS= ${TARGETS} TARGET_ARCHES_arm?= arm armeb armv6 armv6hf TARGET_ARCHES_arm64?= aarch64 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 -.for target in ${TARGETS} arm64 +.for target in ${TARGETS} TARGET_ARCHES_${target}?= ${target} .endfor +# XXX Add arm64 to universe only if we have an external binutils installed. +# It does not build with the in-tree linker. +.if !exists(/usr/local/aarch64-freebsd/bin/ld) && empty(${TARGETS}) +_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64} +universe: universe_arm64_skip +universe_epilogue: universe_arm64_skip +universe_arm64_skip: universe_prologue + @echo ">> arm64 skipped - install aarch64-binutils port or package to build" +.endif + .if defined(UNIVERSE_TARGET) MAKE_JUST_WORLDS= YES .else @@ -410,7 +411,7 @@ KERNSRCDIR?= ${.CURDIR}/sys targets: .PHONY @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" -.for target in ${TARGETS} arm64 +.for target in ${TARGETS} .for target_arch in ${TARGET_ARCHES_${target}} @echo " ${target}/${target_arch}" .endfor @@ -432,7 +433,7 @@ universe_prologue: .if defined(DOING_TINDERBOX) @rm -f ${FAILFILE} .endif -.for target in ${TARGETS} +.for target in ${_UNIVERSE_TARGETS} universe: universe_${target} universe_epilogue: universe_${target} universe_${target}: universe_${target}_prologue
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509170454.t8H4soto091872>