From a84ff2b6d4b6f1e5a315cc043bb8e2b730f254f4 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 28 Jan 2021 23:01:11 +0100
Subject: 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.
---
 src/bootstrap/native.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bootstrap')

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");
             }
         }
 
-- 
cgit 1.4.1-3-g733a5