svn commit: r280715 - in projects/lld-import: . share/mk tools/build/options usr.bin/clang

[Dimitry Andric]

Author: dim
Date: Thu Mar 26 22:31:55 2015
New Revision: 280715
URL: https://svnweb.freebsd.org/changeset/base/280715

Log:
  Add src.opts.mk option WITH_LLD, to connect lld to the build.

Added:
  projects/lld-import/tools/build/options/WITH_LLD   (contents, props changed)
Modified:
  projects/lld-import/Makefile.inc1
  projects/lld-import/share/mk/src.opts.mk
  projects/lld-import/usr.bin/clang/Makefile

Modified: projects/lld-import/Makefile.inc1
==============================================================================
--- projects/lld-import/Makefile.inc1	Thu Mar 26 22:05:31 2015	(r280714)
+++ projects/lld-import/Makefile.inc1	Thu Mar 26 22:31:55 2015	(r280715)
@@ -259,7 +259,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
-		MK_LLDB=no MK_TESTS=no
+		MK_LLD=no MK_LLDB=no MK_TESTS=no
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -271,7 +271,7 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		-DNO_LINT \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
-		MK_LLDB=no MK_TESTS=no
+		MK_LLD=no MK_LLDB=no MK_TESTS=no
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -1527,7 +1527,7 @@ NXBMAKE=	${NXBENV} ${MAKE} \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
-		MK_LLDB=no
+		MK_LLD=no MK_LLDB=no
 
 native-xtools: .MAKE
 	mkdir -p ${OBJTREE}/nxb-bin/bin

Modified: projects/lld-import/share/mk/src.opts.mk
==============================================================================
--- projects/lld-import/share/mk/src.opts.mk	Thu Mar 26 22:05:31 2015	(r280714)
+++ projects/lld-import/share/mk/src.opts.mk	Thu Mar 26 22:31:55 2015	(r280715)
@@ -181,6 +181,7 @@ __DEFAULT_NO_OPTIONS = \
     EISA \
     FMAKE \
     HESIOD \
+    LLD \
     LLDB \
     NAND \
     OFED \
@@ -382,6 +383,7 @@ MK_${vv:H}:=	${MK_${vv:T}}
 
 .if !${COMPILER_FEATURES:Mc++11}
 MK_LLDB:=	no
+MK_LLD:=	no
 .endif
 
 # gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case.

Added: projects/lld-import/tools/build/options/WITH_LLD
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/lld-import/tools/build/options/WITH_LLD	Thu Mar 26 22:31:55 2015	(r280715)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build the LLD linker.

Modified: projects/lld-import/usr.bin/clang/Makefile
==============================================================================
--- projects/lld-import/usr.bin/clang/Makefile	Thu Mar 26 22:05:31 2015	(r280714)
+++ projects/lld-import/usr.bin/clang/Makefile	Thu Mar 26 22:31:55 2015	(r280715)
@@ -25,6 +25,10 @@ SUBDIR+=bugpoint \
 	opt
 .endif
 
+.if ${MK_LLD} != "no"
+SUBDIR+=lld
+.endif
+
 .if ${MK_LLDB} != "no"
 SUBDIR+=lldb
 .endif