Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC
Reported by: Dan McGregor <dan.mcgregor usask.ca>
This commit is contained in:
parent
f551fe4637
commit
f52e4bdfd7
@ -516,7 +516,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
|
||||
# cross-tools stage
|
||||
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
|
||||
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
|
||||
MK_GDB=no MK_TESTS=no MK_LLD_AS_LD=no
|
||||
MK_GDB=no MK_TESTS=no MK_LLD_IS_LD=no
|
||||
|
||||
# kernel-tools stage
|
||||
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
||||
|
4
UPDATING
4
UPDATING
@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
|
||||
|
||||
****************************** SPECIAL WARNING: ******************************
|
||||
|
||||
20170127:
|
||||
The WITH_LLD_AS_LD / WITHOUT_LLD_AS_LD build knobs have been renamed
|
||||
WITH_LLD_IS_LD / WITHOUT_LLD_IS_LD, for consistency with CLANG_IS_CC.
|
||||
|
||||
20170112:
|
||||
The EM_MULTIQUEUE kernel configuration option is deprecated now that
|
||||
the em(4) driver conforms to iflib specifications.
|
||||
|
@ -49,7 +49,7 @@ CLEANFILES+= ldemul-list.h stringify.sed
|
||||
|
||||
FILES= ${LDSCRIPTS:S|^|ldscripts/|}
|
||||
FILESDIR= ${SCRIPTDIR}
|
||||
.if ${MK_LLD_AS_LD} == "no"
|
||||
.if ${MK_LLD_IS_LD} == "no"
|
||||
LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld
|
||||
.endif
|
||||
|
||||
|
@ -251,9 +251,9 @@ __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
|
||||
__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
|
||||
.endif
|
||||
.if ${__T} == "aarch64"
|
||||
__DEFAULT_YES_OPTIONS+=LLD_AS_LD
|
||||
__DEFAULT_YES_OPTIONS+=LLD_IS_LD
|
||||
.else
|
||||
__DEFAULT_NO_OPTIONS+=LLD_AS_LD
|
||||
__DEFAULT_NO_OPTIONS+=LLD_IS_LD
|
||||
.endif
|
||||
.if ${__T} == "aarch64" || ${__T} == "amd64"
|
||||
__DEFAULT_YES_OPTIONS+=LLD LLDB
|
||||
|
@ -8,7 +8,7 @@ LLD_SRCS= ${LLVM_SRCS}/tools/lld
|
||||
PACKAGE= lld
|
||||
PROG_CXX= ld.lld
|
||||
MAN=
|
||||
.if ${MK_LLD_AS_LD} != "no"
|
||||
.if ${MK_LLD_IS_LD} != "no"
|
||||
SYMLINKS= ${PROG_CXX} ${BINDIR}/ld
|
||||
.endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user