svn commit: r312896 - in projects/clang400-import: lib/clang/libllvm tools/build/mk

[Ed Maste]

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