diff options
| author | jhb <jhb@FreeBSD.org> | 2017-08-29 22:54:31 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2017-08-29 22:54:31 +0000 |
| commit | 13f7773e0fcd2e5e3f125ba358a82e04db857564 (patch) | |
| tree | 37c816a1dea9370d4c52147ce8c7f7cfb7737959 /tools | |
| parent | 666efbbb3616033cb79bcc5fd8e52570ba4f8240 (diff) | |
| download | FreeBSD-src-13f7773e0fcd2e5e3f125ba358a82e04db857564.zip FreeBSD-src-13f7773e0fcd2e5e3f125ba358a82e04db857564.tar.gz | |
MFC 309775,312897: Don't delete /usr/bin/ld if it is lld.
309775:
Keep /usr/bin/ld for WITHOUT_BINUTILS but WITH_LLD_AS_LD
312897:
Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC
An additional case missed in r312855
Reported by: Mark Millard
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c357e6a..11e3a9a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -220,7 +220,9 @@ OLD_DIRS+=usr/share/examples/bhyve .if ${MK_BINUTILS} == no OLD_FILES+=usr/bin/as +.if ${MK_LLD_IS_LD} == no OLD_FILES+=usr/bin/ld +.endif OLD_FILES+=usr/bin/ld.bfd .if ${MK_ELFCOPY_AS_OBJCOPY} == no OLD_FILES+=usr/bin/objcopy |
