diff options
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/ld/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 4 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_LLD_IS_LD (renamed from tools/build/options/WITHOUT_LLD_AS_LD) | 0 | ||||
| -rw-r--r-- | tools/build/options/WITH_LLD_IS_LD (renamed from tools/build/options/WITH_LLD_AS_LD) | 0 | ||||
| -rw-r--r-- | usr.bin/clang/lld/Makefile | 2 |
7 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 3decab02b856..3d505a5ed4e1 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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" \ @@ -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. diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index 6fcc69a479fc..c5b5d313485c 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -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 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0b11702fb13c..ee849f6d1754 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 diff --git a/tools/build/options/WITHOUT_LLD_AS_LD b/tools/build/options/WITHOUT_LLD_IS_LD index 0d48f205d85d..0d48f205d85d 100644 --- a/tools/build/options/WITHOUT_LLD_AS_LD +++ b/tools/build/options/WITHOUT_LLD_IS_LD diff --git a/tools/build/options/WITH_LLD_AS_LD b/tools/build/options/WITH_LLD_IS_LD index a291b099bf06..a291b099bf06 100644 --- a/tools/build/options/WITH_LLD_AS_LD +++ b/tools/build/options/WITH_LLD_IS_LD diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 6a41cd528ff4..9d1024b27022 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -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 |