From 3dca93a2c3f8832c649800e2bcfad07158d1f9db Mon Sep 17 00:00:00 2001
From: Kamil Rytarowski <n54@gmx.com>
Date: Wed, 3 Jun 2020 13:32:35 +0200
Subject: [PATCH 2/2] Install llvm-symbolizer

---
 distrib/sets/lists/comp/mi                         | 1 +
 distrib/sets/lists/debug/mi                        | 1 +
 external/apache2/llvm/bin/Makefile                 | 4 ++--
 external/apache2/llvm/bin/llvm-symbolizer/Makefile | 2 ++
 external/apache2/llvm/lib/Makefile                 | 6 ++----
 tools/Makefile                                     | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 3135d7a9fcba..3a4eda1b2bb2 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -52,6 +52,7 @@
 ./usr/bin/lint					comp-c-bin
 ./usr/bin/lld					comp-obsolete		obsolete
 ./usr/bin/lldb					comp-obsolete		obsolete
+./usr/bin/llvm-symbolizer			comp-c-bin		llvm
 ./usr/bin/llvm-tblgen				comp-c-bin		llvm
 ./usr/bin/lorder				comp-util-bin
 ./usr/bin/luac					comp-util-bin
diff --git a/distrib/sets/lists/debug/mi b/distrib/sets/lists/debug/mi
index cc5b543d0a68..c1ea42b073dc 100644
--- a/distrib/sets/lists/debug/mi
+++ b/distrib/sets/lists/debug/mi
@@ -630,6 +630,7 @@
 ./usr/libdata/debug/usr/bin/lex.debug		comp-c-debug		debug
 ./usr/libdata/debug/usr/bin/lint.debug		comp-c-debug		debug
 ./usr/libdata/debug/usr/bin/lkbib.debug		comp-groff-debug	groff,debug
+./usr/libdata/debug/usr/bin/llvm-symbolizer.debug	comp-c-debug		llvm,debug
 ./usr/libdata/debug/usr/bin/llvm-tblgen.debug	comp-c-debug		llvm,debug
 ./usr/libdata/debug/usr/bin/locale.debug	comp-locale-debug	debug
 ./usr/libdata/debug/usr/bin/locate.debug	comp-util-debug		debug
diff --git a/external/apache2/llvm/bin/Makefile b/external/apache2/llvm/bin/Makefile
index 360fd0a4e82b..56545bb827f5 100644
--- a/external/apache2/llvm/bin/Makefile
+++ b/external/apache2/llvm/bin/Makefile
@@ -4,7 +4,8 @@
 
 SUBDIR=	clang \
 	clang-tblgen \
-	tblgen
+	tblgen \
+	llvm-symbolizer
 
 .if defined(LLVM_DEVELOPER)
 SUBDIR+= \
@@ -32,7 +33,6 @@ SUBDIR+= \
 	llvm-readobj \
 	llvm-size \
 	llvm-strings \
-	llvm-symbolizer \
 	llvm-xray \
 	opt \
 	sancov \
diff --git a/external/apache2/llvm/bin/llvm-symbolizer/Makefile b/external/apache2/llvm/bin/llvm-symbolizer/Makefile
index 77f130794cb9..0ccd7949b155 100644
--- a/external/apache2/llvm/bin/llvm-symbolizer/Makefile
+++ b/external/apache2/llvm/bin/llvm-symbolizer/Makefile
@@ -21,6 +21,8 @@ LLVM_LIBS+= \
 	BitstreamReader \
 	IR \
 	BinaryFormat \
+	ObjectYAML \
+	TextAPI \
 	Support \
 	Demangle
 
diff --git a/external/apache2/llvm/lib/Makefile b/external/apache2/llvm/lib/Makefile
index c11d52017158..bf0d1d1cedb1 100644
--- a/external/apache2/llvm/lib/Makefile
+++ b/external/apache2/llvm/lib/Makefile
@@ -116,12 +116,11 @@ SUBDIR+= \
 	libLLVMRuntimeDyld
 .endif
 
-.if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
 SUBDIR+= \
 	libLLVMDebugInfoPDB \
 	libLLVMDebugInfoPDBNative \
-	libLLVMDebugInfoSymbolize
-.endif
+	libLLVMDebugInfoSymbolize \
+	libLLVMObjectYAML
 
 .if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
 SUBDIR+= \
@@ -129,7 +128,6 @@ SUBDIR+= \
 	libLLVMHello \
 	libLLVMInterpreter \
 	libLLVMLineEditor \
-	libLLVMObjectYAML \
 	libLLVMToolDrivers \
 	libLLVMToolDriversDlltool \
 	libLLVMXRay
diff --git a/tools/Makefile b/tools/Makefile
index 641690ea603f..f6faaaa9e611 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -131,7 +131,7 @@ SUBDIR+= \
 .endif
 .if ${MKLLVM} != "no"
 SUBDIR+= \
-	llvm-clang-tblgen
+	llvm-clang-tblgen llvm-symbolizer
 .endif
 .if ${MKLLVM} != "no" && !defined(EXTERNAL_TOOLCHAIN)
 SUBDIR+= \
-- 
2.25.2