svn commit: r286842 - in head: . share/mk
Ed Maste
emaste at FreeBSD.org
Mon Aug 17 10:48:57 UTC 2015
Author: emaste
Date: Mon Aug 17 10:48:55 2015
New Revision: 286842
URL: https://svnweb.freebsd.org/changeset/base/286842
Log:
Separate ELFTOOLCHAIN_BOOTSTRAP from BINUTILS_BOOTSTRAP
For most cases they are equivalent, but BINUTILS_BOOTSTRAP is a
BROKEN_OPTION on arm64 as the in-tree GNU binutils do not support it,
so we need a separate internal flag for ELF Tool Chain.
Reviewed by: andrew, brooks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D3381
Modified:
head/Makefile.inc1
head/share/mk/src.opts.mk
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Mon Aug 17 10:03:23 2015 (r286841)
+++ head/Makefile.inc1 Mon Aug 17 10:48:55 2015 (r286842)
@@ -1493,6 +1493,8 @@ _btxld= usr.sbin/btxld
.if ${XAS:M/*} == ""
.if ${MK_BINUTILS_BOOTSTRAP} != "no"
_binutils= gnu/usr.bin/binutils
+.endif
+.if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
_elftctools= lib/libelftc \
usr.bin/elfcopy \
usr.bin/nm \
@@ -1502,7 +1504,7 @@ _elftctools= lib/libelftc \
# cross-build on a FreeBSD 10 host:
_elftctools+= usr.bin/addr2line
.endif
-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_BINUTILS_BOOTSTRAP} != "no"
+.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
# If cross-building with an external binutils we still need to build strip for
# the target (for at least crunchide).
_elftctools= lib/libelftc \
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Mon Aug 17 10:03:23 2015 (r286841)
+++ head/share/mk/src.opts.mk Mon Aug 17 10:48:55 2015 (r286842)
@@ -80,6 +80,7 @@ __DEFAULT_YES_OPTIONS = \
DYNAMICROOT \
ED_CRYPTO \
EE \
+ ELFTOOLCHAIN_BOOTSTRAP \
EXAMPLES \
FDT \
FILE \
@@ -328,6 +329,7 @@ MK_GROFF:= no
.if ${MK_CROSS_COMPILER} == "no"
MK_BINUTILS_BOOTSTRAP:= no
MK_CLANG_BOOTSTRAP:= no
+MK_ELFTOOLCHAIN_BOOTSTRAP:= no
MK_GCC_BOOTSTRAP:= no
.endif
More information about the svn-src-all
mailing list