Move ELF compression related libraries to configure_llvm so those options also apply to lld.

Author: khuey

src/bootstrap/src/core/build_steps/llvm.rs

@@ -368,16 +368,6 @@ impl Step for Llvm {
             cfg.define("LLVM_PROFDATA_FILE", path);
         }
 
-        // Libraries for ELF compression.
-        if !target.is_windows() {
-            cfg.define("LLVM_ENABLE_ZLIB", "ON");
-            cfg.define("LLVM_ENABLE_ZSTD", "ON");
-            cfg.define("LLVM_USE_STATIC_ZSTD", "TRUE");
-        } else {
-            cfg.define("LLVM_ENABLE_ZLIB", "OFF");
-            cfg.define("LLVM_ENABLE_ZSTD", "OFF");
-        }
-
         // Are we compiling for iOS/tvOS/watchOS/visionOS?
         if target.contains("apple-ios")
             || target.contains("apple-tvos")
@@ -825,6 +815,16 @@ fn configure_llvm(builder: &Builder<'_>, target: TargetSelection, cfg: &mut cmak
         }
     }
 
+    // Libraries for ELF section compression.
+    if !target.is_windows() {
+        cfg.define("LLVM_ENABLE_ZLIB", "ON");
+        cfg.define("LLVM_ENABLE_ZSTD", "ON");
+        cfg.define("LLVM_USE_STATIC_ZSTD", "TRUE");
+    } else {
+        cfg.define("LLVM_ENABLE_ZLIB", "OFF");
+        cfg.define("LLVM_ENABLE_ZSTD", "OFF");
+    }
+
     if let Some(ref linker) = builder.config.llvm_use_linker {
         cfg.define("LLVM_USE_LINKER", linker);
     }