svn commit: r323005 - stable/11/tools/build/mk

[John Baldwin]

Author: jhb
Date: Tue Aug 29 22:54:31 2017
New Revision: 323005
URL: https://svnweb.freebsd.org/changeset/base/323005

Log:
  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

Modified:
  stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Tue Aug 29 22:37:24 2017	(r323004)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Tue Aug 29 22:54:31 2017	(r323005)
@@ -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