From owner-svn-src-stable-11@freebsd.org  Tue Aug 29 22:54:33 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C33CDE7C2A;
 Tue, 29 Aug 2017 22:54:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD52674567;
 Tue, 29 Aug 2017 22:54:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7TMsVJG078888;
 Tue, 29 Aug 2017 22:54:31 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7TMsVRK078887;
 Tue, 29 Aug 2017 22:54:31 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201708292254.v7TMsVRK078887@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 29 Aug 2017 22:54:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r323005 - stable/11/tools/build/mk
X-SVN-Group: stable-11
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: stable/11/tools/build/mk
X-SVN-Commit-Revision: 323005
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Aug 2017 22:54:33 -0000

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