Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2019 17:11:18 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353655 - head/usr.bin/clang/lld
Message-ID:  <201910161711.x9GHBI17067392@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910161711.x9GHBI17067392>