Additional components

swift-nav · Feb 23, 2023 · 9fb7c32 · 9fb7c32
1 parent 845cbcf
commit 9fb7c32
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -52,7 +52,7 @@ pipeline {
 
                             find ../out/
                         ''')
-                        // uploadDistribution("clang+llvm-14.0.6-x86_64-linux", context)
+                        uploadDistribution("clang+llvm-14.0.6-x86_64-linux", context)
                     }
                 }
                 // stage('llvm aarch64 darwin') {
@@ -109,18 +109,8 @@ pipeline {
 
 def uploadDistribution(name, context) {
     sh("""
-        mkdir -p tar/${name}/bin
-        cp llvm-project/out/bin/llvm-ar \
-            llvm-project/out/bin/llvm-cov \
-            llvm-project/out/bin/llvm-dwp \
-            llvm-project/out/bin/llvm-nm \
-            llvm-project/out/bin/llvm-objcopy \
-            llvm-project/out/bin/llvm-objdump \
-            llvm-project/out/bin/llvm-profdata \
-            llvm-project/out/bin/llvm-strip \
-            llvm-project/out/bin/clang-cpp \
-            llvm-project/out/bin/ld.lld \
-            tar/${name}/bin
+        mkdir -p tar/${name}/
+        cp -rH llvm-project/out/* tar/${name}/
     """)
     tar(file: "${name}.tar.gz", dir: 'tar', archive: true)
     script{

diff --git a/llvm/Distribution.cmake b/llvm/Distribution.cmake
@@ -1,8 +1,10 @@
 # This file sets up a CMakeCache for a simple distribution bootstrap build.
 
 #Enable LLVM projects and runtimes
-set(LLVM_ENABLE_PROJECTS "clang;lld" CACHE STRING "")
-set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "")
+set(LLVM_ENABLE_PROJECTS "clang;clang-tools-extra;lld" CACHE STRING "")
+set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
+
+set(COMPILER_RT_BUILD_BUILTINS              ON CACHE BOOL "")
 
 set(LLVM_TOOLCHAIN_TOOLS
   llvm-ar
@@ -18,9 +20,13 @@ set(LLVM_TOOLCHAIN_TOOLS
 set(LLVM_DISTRIBUTION_COMPONENTS
   clang
   lld
+  builtins
+  runtimes
+  clang-resource-headers
   ${LLVM_TOOLCHAIN_TOOLS}
   CACHE STRING "")
 
+
 # Only build the native target in stage1 since it is a throwaway build.
 set(LLVM_TARGETS_TO_BUILD Native CACHE STRING "")