Change how LLVM is being built

Author: topjohnwu

build.sh

@@ -61,11 +61,6 @@ collect() {
   find . -name '*.old' -delete
   cp -af ../rust/build/$TRIPLE/llvm/bin llvm-bin
   find ../rust/build/$TRIPLE/llvm/lib -name "*.${DYN_EXT}*" -exec cp -an {} lib \;
-  local lib_llvm="libLLVM.${DYN_EXT}"
-  if [ -L "lib/$lib_llvm" ]; then
-    lib_llvm=$(readlink "lib/$lib_llvm")
-  fi
-  ln -s ../../../$lib_llvm lib/rustlib/$TRIPLE/lib/$lib_llvm
   strip_exe llvm-bin/llvm-strip
   cd ..
 }

config.toml

@@ -32,8 +32,7 @@ sysconfdir = "etc"
 [rust]
 channel = "nightly"
 lto = "thin"
-lld = true
-llvm-tools = true
+lld = false
 strip = true
 codegen-units = 1
 

patches/patch_llvm_build.patch

@@ -1,5 +1,5 @@
 diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
-index be5b4057..d053add5 100644
+index be5b4057..da2b5054 100644
 --- a/src/bootstrap/src/core/build_steps/llvm.rs
 +++ b/src/bootstrap/src/core/build_steps/llvm.rs
 @@ -308,7 +308,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
@@ -11,18 +11,17 @@ index be5b4057..d053add5 100644
              panic!("shared linking to LLVM is not currently supported on {}", target.triple);
          }
 
-@@ -463,6 +463,10 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
+@@ -463,6 +463,9 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
              enabled_llvm_projects.push("clang");
          }
 
-+        if builder.config.lld_enabled {
-+            enabled_llvm_projects.push("lld");
-+        }
++        // ONDK change: always enable lld
++        enabled_llvm_projects.push("lld");
 +
          // We want libxml to be disabled.
          // See https://github.com/rust-lang/rust/pull/50104
          cfg.define("LLVM_ENABLE_LIBXML2", "OFF");
-@@ -567,7 +571,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
+@@ -567,7 +570,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
          // link to make llvm-config happy.
          if builder.llvm_link_shared() && target.contains("apple-darwin") {
              let lib_name = find_llvm_lib_name("dylib");