From owner-svn-src-projects@freebsd.org  Fri Jan 27 21:14:43 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 B4394CC42D5
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 27 Jan 2017 21:14:43 +0000 (UTC)
 (envelope-from emaste@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 839346DB;
 Fri, 27 Jan 2017 21:14:43 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0RLEgp5096100;
 Fri, 27 Jan 2017 21:14:42 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0RLEgI5096098;
 Fri, 27 Jan 2017 21:14:42 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201701272114.v0RLEgI5096098@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 27 Jan 2017 21:14:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r312896 - in projects/clang400-import: lib/clang/libllvm
 tools/build/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jan 2017 21:14:43 -0000

Author: emaste
Date: Fri Jan 27 21:14:42 2017
New Revision: 312896
URL: https://svnweb.freebsd.org/changeset/base/312896

Log:
  Additional LD_AS_LLD -> LD_IS_LLD missed in r312894/r312895

Modified:
  projects/clang400-import/lib/clang/libllvm/Makefile
  projects/clang400-import/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/clang400-import/lib/clang/libllvm/Makefile
==============================================================================
--- projects/clang400-import/lib/clang/libllvm/Makefile	Fri Jan 27 20:49:43 2017	(r312895)
+++ projects/clang400-import/lib/clang/libllvm/Makefile	Fri Jan 27 21:14:42 2017	(r312896)
@@ -1146,7 +1146,7 @@ SRCS_MIN+=	Transforms/Vectorize/SLPVecto
 SRCS_EXT+=	Transforms/Vectorize/Vectorize.cpp
 
 SRCS_ALL+=	${SRCS_MIN}
-.if !defined(TOOLS_PREFIX) || ${MK_LLD_AS_LD} != "no"
+.if !defined(TOOLS_PREFIX) || ${MK_LLD_IS_LD} != "no"
 SRCS_ALL+=	${SRCS_MIW}
 .endif
 .if ${MK_CLANG_EXTRAS} != "no"

Modified: projects/clang400-import/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/clang400-import/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jan 27 20:49:43 2017	(r312895)
+++ projects/clang400-import/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jan 27 21:14:42 2017	(r312896)
@@ -221,7 +221,7 @@ OLD_DIRS+=usr/share/examples/bhyve
 
 .if ${MK_BINUTILS} == no
 OLD_FILES+=usr/bin/as
-.if ${MK_LLD_AS_LD} == no
+.if ${MK_LLD_IS_LD} == no
 OLD_FILES+=usr/bin/ld
 .endif
 OLD_FILES+=usr/bin/ld.bfd