From c9af192690d52818e83acb8b591d23dbab856f77 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Wed, 13 Oct 2021 22:56:26 +0000 Subject: [PATCH] Allow static linking LLVM with ThinLTO --- src/bootstrap/config.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 5706b8f9e7cc6..46843dac42f28 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -824,15 +824,10 @@ impl Config { }; } - if config.llvm_thin_lto { - // If we're building with ThinLTO on, we want to link to LLVM - // shared, to avoid re-doing ThinLTO (which happens in the link - // step) with each stage. - assert_ne!( - llvm.link_shared, - Some(false), - "setting link-shared=false is incompatible with thin-lto=true" - ); + if config.llvm_thin_lto && llvm.link_shared.is_none() { + // If we're building with ThinLTO on, by default we want to link + // to LLVM shared, to avoid re-doing ThinLTO (which happens in + // the link step) with each stage. config.llvm_link_shared = true; } }