hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-29 20:54:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rework how the ld link is handled in WORLDTMP from r322811.

Browse Source 
LLD_BOOTSTRAP (build) is independent of LLD_IS_LD (installed) so they
should not be based on each other.

This is related to upcoming WITH_SYSTEM_LINKER work.

Reviewed by:	emaste
Sponsored by:	Dell EMC
Differential Revision:	https://reviews.freebsd.org/D15836
This commit is contained in:
Bryan Drewery 2018-06-20 16:10:02 +00:00
parent 78442297f5
commit d74021d65b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=335447
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -586,7 +586,7 @@ TMAKE= \
# TOOLS_PREFIX set in BMAKE # TOOLS_PREFIX set in BMAKE
XMAKE= ${BMAKE} \ XMAKE= ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no MK_GDB=no MK_TESTS=no
# kernel-tools stage # kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \

7
gnu/usr.bin/binutils/ld/Makefile
View File

@ -7,8 +7,10 @@ ELF_SCR_EXT= x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw
.PATH: ${SRCDIR}/ld .PATH: ${SRCDIR}/ld
PROG= ld.bfd PROG= ld.bfd
.if ${MK_LLD_IS_LD} == "no" .if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} == "no") || \
(defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} == "no")
MAN= ld.1 MAN= ld.1
LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld
.else .else
MAN= ld.bfd.1 MAN= ld.bfd.1
CLEANFILES+= ld.bfd.1 CLEANFILES+= ld.bfd.1
@ -57,9 +59,6 @@ CLEANFILES+= ldemul-list.h stringify.sed
FILES= ${LDSCRIPTS:S|^|ldscripts/|} FILES= ${LDSCRIPTS:S|^|ldscripts/|}
FILESDIR= ${SCRIPTDIR} FILESDIR= ${SCRIPTDIR}
.if ${MK_LLD_IS_LD} == "no"
LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld
.endif
HOST= ${TARGET_TUPLE} HOST= ${TARGET_TUPLE}
LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\" LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\"

3
usr.bin/clang/lld/Makefile
View File

@ -8,7 +8,8 @@ LLD_SRCS= ${LLVM_SRCS}/tools/lld
PACKAGE= lld PACKAGE= lld
PROG_CXX= ld.lld PROG_CXX= ld.lld
.if ${MK_LLD_IS_LD} != "no" .if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} != "no") || \
(defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no")
SYMLINKS= ${PROG_CXX} ${BINDIR}/ld SYMLINKS= ${PROG_CXX} ${BINDIR}/ld
MLINKS= ld.lld.1 ld.1 MLINKS= ld.lld.1 ld.1
.endif .endif