[lumen] build script/dockerfile updates

Author: bitwalker

Makefile

@@ -88,12 +88,12 @@ dist-linux: ## Build an LLVM release distribution for x86_64-unknown-linux
 	docker build \
 		-t llvm-project:dist-$(RELEASE)-$(SHA) \
 		--target=dist \
-		--build-arg buildscript_args="-release=$(RELEASE) -flavor=RelWithDebInfo -clean-obj" . && \
+		--build-arg buildscript_args="-release=$(RELEASE) -with-dylib -link-dylib -flavor=RelWithDebInfo -clean-obj -j=2" . && \
 		utils/dist/extract-release.sh -release $(RELEASE) -sha $(SHA)
 
 docker: ## Build a Docker image containing an LLVM distribution
 	cd lumen/ && \
 	docker build \
 		-t lumen/llvm:latest \
 		--target=release \
-		--build-arg buildscript_args="-release=$(RELEASE) -flavor=RelWithDebInfo -clean-obj" .
+		--build-arg buildscript_args="-release=$(RELEASE) -with-dylib -link-dylib -flavor=RelWithDebInfo -clean-obj -j=2" .

lumen/Dockerfile

@@ -26,6 +26,8 @@ RUN apt-get update && \
         libxml2-dev \
         libncurses5-dev \
         python2.7-dev \
+        python3 \
+        python3-dev \
         file \
         python \
         wget \

lumen/utils/dist/build-dist.sh

@@ -47,25 +47,14 @@ install_toolchain_only="OFF"
 c_compiler="$CC"
 cxx_compiler="$CXX"
 
-llvm_tools=";llvm-objcopy" # used to transform ELFs into binary format which flashing tools consume
-llvm_tools=";llvm-objdump" # used to disassemble programs
-llvm_tools=";llvm-profdata" # used to inspect and merge files generated by profiles
-llvm_tools=";llvm-readobj" # used to get information from ELFs/objects that the other tools don't provide
-llvm_tools=";llvm-size" # used to prints the size of the linker sections of a program
-llvm_tools=";llvm-strip" # used to discard symbols from binary files to reduce their size
-llvm_tools=";llvm-ar" # used for creating and modifying archive files
-llvm_tools=";llvm-config" # used for build configuration
-llvm_tools=";llvm-tblgen" # used for tablegen
-llvm_tools=";mlir-tblgen" # used for tablegen
-
 llvm_dylib_components="all"
 
 enable_runtimes="compiler-rt;libcxx;libcxxabi;libunwind"
-# Disable lldb on macOS by default
-if [ "$(uname -s)" = "Darwin" ]; then
-    enable_projects="clang;clang-tools-extra;lld;llvm;mlir"
-else
-    enable_projects="clang;clang-tools-extra;lld;lldb;llvm;mlir"
+enable_projects="llvm;mlir;lld;clang;lldb"
+
+# Disable lldb on macOS
+if [[ "$enable_projects" =~ "lldb" ]] && [ "$(uname -s)" = "Darwin" ]; then
+    enable_projects="llvm;mlir;lld;clang"
 fi
 
 num_jobs=""
@@ -407,9 +396,6 @@ function configure_core() {
         if [[ ! "$triple" =~ apple ]]; then
             extra_configure_flags="-DLLVM_ENABLE_LLD=ON $extra_configure_flags"
         fi
-        if [[ ! "$triple" =~ "apple-darwin" ]] && [[ ! "$triple" =~ "linux-gnu" ]]; then
-            extra_configure_flags="-DLLVM_LINK_LLVM_DYLIB=OFF $extra_configure_flags"
-        fi
         if [ -n "$enable_static_libcpp" ]; then
             if [[ "$triple" =~ "apple" ]]; then
                 extra_configure_flags="-DCMAKE_EXE_LINKER_FLAGS=\"-static-libstdc++\" $extra_configure_flags"