diff options
| author | emaste <emaste@FreeBSD.org> | 2015-08-17 10:48:55 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-08-17 10:48:55 +0000 |
| commit | dd4db76e81c281772642f7d239065bb733b424cf (patch) | |
| tree | 25ec797aaad323809794c20d6b4d6818027d3049 | |
| parent | 156842dd3e03515a9f38c4b1cfcafe165f739319 (diff) | |
| download | FreeBSD-src-dd4db76e81c281772642f7d239065bb733b424cf.zip FreeBSD-src-dd4db76e81c281772642f7d239065bb733b424cf.tar.gz | |
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
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b14051c..617366c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 \ diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index e542ccc..a5e78a3 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 |
