d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm: fix some llvm-* tool links when WITH_LLVM_BINUTILS is set

Browse Source 
A few Makefiles overrode LINKS and MLINKS when WITH_LLVM_BINUTILS was
set, which caused some llvm- prefixed tools to disappear.  One such case
was llvm-ranlib, which some ports invoke explicitly.

Use += when adding to LINKS and MLINKS under WITH_LLVM_BINUTILS.

PR:		270955, 270956, 270959
Submitted by:	jbeich
Reviewed by:	arichardson
Fixes: 021385aba5 ("Add WITH_LLVM_BINUTILS to install LLVM binuti...")
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39747
This commit is contained in:
Ed Maste 2023-04-21 09:11:45 -04:00
parent 7b42f338d7
commit 41df1d60e3
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/clang/llvm-ar/Makefile
View File

@ -15,8 +15,8 @@ LIBADD+= z
LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
.if ${MK_LLVM_BINUTILS} != "no"
LINKS= ${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib
MLINKS= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1
LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib
MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1
.endif
.include "../llvm.prog.mk"

4
usr.bin/clang/llvm-nm/Makefile
View File

@ -26,8 +26,8 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
LIBADD+= z
.if ${MK_LLVM_BINUTILS} != "no"
LINKS= ${BINDIR}/llvm-nm ${BINDIR}/nm
MLINKS= llvm-nm.1 nm.1
LINKS+= ${BINDIR}/llvm-nm ${BINDIR}/nm
MLINKS+= llvm-nm.1 nm.1
.endif
.include "../llvm.prog.mk"

4
usr.bin/clang/llvm-size/Makefile
View File

@ -24,8 +24,8 @@ DPSRCS+= ${TGHDRS}
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
.if ${MK_LLVM_BINUTILS} != "no"
LINKS= ${BINDIR}/llvm-size ${BINDIR}/size
MLINKS= llvm-size.1 size.1
LINKS+= ${BINDIR}/llvm-size ${BINDIR}/size
MLINKS+= llvm-size.1 size.1
.endif
.include "../llvm.prog.mk"

4
usr.bin/clang/llvm-symbolizer/Makefile
View File

@ -29,8 +29,8 @@ LIBADD+= z
LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line
.if ${MK_LLVM_BINUTILS} != "no"
LINKS= ${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line
MLINKS= llvm-addr2line.1 addr2line.1
LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line
MLINKS+= llvm-addr2line.1 addr2line.1
.endif
.include "../llvm.prog.mk"