diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2015-04-28 17:13:05 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2015-04-28 17:13:05 +0000 |
| commit | 504f34b36222a6373485157ebecd5f7854ba6d2e (patch) | |
| tree | 12f7344ca90cb276ca1226703cc86b5d6ba7093d /Makefile | |
| parent | e948489558dbfbbc20c5f7dc600441956ca6f167 (diff) | |
| download | src-test-504f34b36222a6373485157ebecd5f7854ba6d2e.tar.gz src-test-504f34b36222a6373485157ebecd5f7854ba6d2e.zip | |
Don't add arm64 to universe builds if the user provided a TARGETS list
Differential Revision: https://reviews.freebsd.org/D2375
Reported by: andrew
Reviewed by: andrew, imp
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=282156
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile index 8ad4af96627bb..34ffe761b98bc 100644 --- a/Makefile +++ b/Makefile @@ -373,19 +373,19 @@ kernel-toolchains: # existing system is. # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) -TARGETS?=amd64 arm 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_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 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 |