From 5132a69f567afa1041b40d450511905f3de096a3 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 16 Oct 2019 17:11:18 +0000 Subject: [PATCH] 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 PR: 241257 MFC after: 3 days --- usr.bin/clang/lld/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 09cc973b15d9..0d8801f491bf 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -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}