about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2021-01-28 23:01:11 +0100
committerNikita Popov <nikita.ppv@gmail.com>2021-01-28 23:01:11 +0100
commita84ff2b6d4b6f1e5a315cc043bb8e2b730f254f4 (patch)
tree2893ed18216e58ccf964e37ba70a8877af83397b
parente066deae088dfeef66c414c181925b28b9a25511 (diff)
downloadrust-a84ff2b6d4b6f1e5a315cc043bb8e2b730f254f4.tar.gz
rust-a84ff2b6d4b6f1e5a315cc043bb8e2b730f254f4.zip
Use LLVM_USE_LINKER instead of LLVM_ENABLE_LLD
This avoids a conflict if llvm.thin-lto=true is combined with an
explicit llvm.use-linker=lld.
-rw-r--r--src/bootstrap/native.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 9c543d49253..8f7ed87d063 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -201,7 +201,7 @@ impl Step for Llvm {
         if builder.config.llvm_thin_lto {
             cfg.define("LLVM_ENABLE_LTO", "Thin");
             if !target.contains("apple") {
-                cfg.define("LLVM_ENABLE_LLD", "ON");
+                cfg.define("LLVM_USE_LINKER", "lld");
             }
         }