On Apr 28, 2015, at 11:04, Andrew Turner <and...@fubar.geek.nz> wrote:
> On Tue, 28 Apr 2015 10:53:57 -0700
> Garrett Cooper <yaneurab...@gmail.com> wrote:
…
>> Why just amd64/arm here?
>
> You're missing part of the line, it contains all architectures with
> arm64 being optional:
>
> +TARGETS?=amd64 arm ${UNIVERSE_arm64} i386 mips pc98 powerpc sparc64
Hi Andrew,
Oh, ok. It was a bit hard for me to read :/...
I had a different change I was going to post up on Phabricator (pasted below).
The goal of my diff was two-fold:
- allow people to override the universe target (in this case universe_arm64) to
skip the one generated for make universe below.
- always add arm64, but enable universe_arm64 only if binutils was installed on
the build host.
I could do the equivalent for the TARGET_ARCHES loop if desired.
Thanks!
-NGie
$ svn diff Makefile
Index: Makefile
===================================================================
--- Makefile (revision 282108)
+++ Makefile (working copy)
@@ -373,19 +373,15 @@
# existing system is.
#
.if make(universe) || make(universe_kernels) || make(tinderbox) ||
make(targets)
-TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64
+TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
# 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)
-TARGETS+=arm64
-TARGET_ARCHES_arm64?= aarch64
-.else
-universe: universe_arm64_skip
-universe_epilogue: universe_arm64_skip
-universe_arm64_skip: universe_prologue
+.if !exists(/usr/local/aarch64-freebsd/bin/ld)
+universe_arm64:
@echo ">> arm64 skipped - install aarch64-binutils port or package to
build"
.endif
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
@@ -427,6 +423,7 @@
.for target in ${TARGETS}
universe: universe_${target}
universe_epilogue: universe_${target}
+.if !target(universe_${target})
universe_${target}: universe_${target}_prologue
universe_${target}_prologue: universe_prologue
@echo ">> ${target} started on `LC_ALL=C date`"
@@ -454,6 +451,7 @@
.endfor
.endif
universe_${target}: universe_${target}_kernels
+.endif
universe_${target}_kernels: universe_${target}_prologue .MAKE
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
signature.asc
Description: Message signed with OpenPGP using GPGMail
