aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2017-04-08 16:14:30 +0000
committerEd Maste <emaste@FreeBSD.org>2017-04-08 16:14:30 +0000
commit1b766820b009ec6be236cf773266c8a4031771f4 (patch)
tree803bb26bcb8a71be03a7ebfc9053f65f8bd26a16
parent7ece126ed8487b99874f6ecc3d0715d18ace60cd (diff)
downloadsrc-1b766820b009ec6be236cf773266c8a4031771f4.tar.gz
src-1b766820b009ec6be236cf773266c8a4031771f4.zip
Unconditionally include arm64 in make universe / tinderbox
As of r316629 FreeBSD/arm64 uses the in-tree LLD linker by default, and does not require an external an aarch64-binutils port or package. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=316645
-rw-r--r--Makefile10
1 files changed, 0 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 8b02703bda5d..929f75f45185 100644
--- a/Makefile
+++ b/Makefile
@@ -427,16 +427,6 @@ TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpcspe
TARGET_ARCHES_${target}?= ${target}
.endfor
-# XXX Remove arm64 from universe if the required binutils package is missing.
-# It does not build with the in-tree linker.
-.if !exists(/usr/local/aarch64-freebsd/bin/ld) && ${TARGETS:Marm64}
-_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64}
-universe: universe_arm64_skip .PHONY
-universe_epilogue: universe_arm64_skip .PHONY
-universe_arm64_skip: universe_prologue .PHONY
- @echo ">> arm64 skipped - install aarch64-binutils port or package to build"
-.endif
-
.if defined(UNIVERSE_TARGET)
MAKE_JUST_WORLDS= YES
.else