From owner-svn-src-all@freebsd.org  Wed Oct 16 17:11:18 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3FD814B686;
 Wed, 16 Oct 2019 17:11:18 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46tf2t4NYpz42dT;
 Wed, 16 Oct 2019 17:11:18 +0000 (UTC) (envelope-from dim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A583A388;
 Wed, 16 Oct 2019 17:11:18 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9GHBI9c067393;
 Wed, 16 Oct 2019 17:11:18 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9GHBI17067392;
 Wed, 16 Oct 2019 17:11:18 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201910161711.x9GHBI17067392@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 16 Oct 2019 17:11:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r353655 - head/usr.bin/clang/lld
X-SVN-Group: head
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: head/usr.bin/clang/lld
X-SVN-Commit-Revision: 353655
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2019 17:11:18 -0000

Author: dim
Date: Wed Oct 16 17:11:18 2019
New Revision: 353655
URL: https://svnweb.freebsd.org/changeset/base/353655

Log:
  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@gmail.com>
  PR:		241257
  MFC after:	3 days

Modified:
  head/usr.bin/clang/lld/Makefile

Modified: head/usr.bin/clang/lld/Makefile
==============================================================================
--- head/usr.bin/clang/lld/Makefile	Wed Oct 16 16:32:58 2019	(r353654)
+++ head/usr.bin/clang/lld/Makefile	Wed Oct 16 17:11:18 2019	(r353655)
@@ -15,6 +15,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}