svn commit: r353765 - in stable: 11/usr.bin/clang/lld 12/usr.bin/clang/lld

[Dimitry Andric]

Author: dim
Date: Sat Oct 19 15:58:20 2019
New Revision: 353765
URL: https://svnweb.freebsd.org/changeset/base/353765

Log:
  MFC r353655:
  
  Ensure lld respects the WITH/WITHOUT_SHARED_TOOLCHAIN option
  
  Traditionally, toolchain components such as cc, as, and ld have been
  built as static executables.  The WITH_SHARED_TOOLCHAIN option from
  src.conf(5) is meant to link these as regular executables, e.g. using
  shared libraries.
  
  The build of ld.lld did not yet check this option.  Fix the Makefile so
  it will do so now.
  
  Reported by:	Mike Cui <cuicui at gmail.com>
  PR:		241257

Modified:
  stable/11/usr.bin/clang/lld/Makefile
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/usr.bin/clang/lld/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/usr.bin/clang/lld/Makefile
==============================================================================
--- stable/11/usr.bin/clang/lld/Makefile	Sat Oct 19 14:56:44 2019	(r353764)
+++ stable/11/usr.bin/clang/lld/Makefile	Sat Oct 19 15:58:20 2019	(r353765)
@@ -14,6 +14,10 @@ SYMLINKS=	${PROG_CXX} ${BINDIR}/ld
 MLINKS=		ld.lld.1 ld.1
 .endif
 
+.if ${MK_SHARED_TOOLCHAIN} == "no"
+NO_SHARED?= yes
+.endif
+
 CFLAGS+=	-I${LLD_SRCS}/ELF
 CFLAGS+=	-I${LLD_SRCS}/include
 CFLAGS+=	-I${.OBJDIR}