Fix tests

Author: Kobzol

src/bootstrap/src/core/config/config.rs

@@ -863,25 +863,26 @@ impl Config {
 
                 let mut target = Target::from_triple(&triple);
 
-                if (target_default_linker.is_some() || rust_default_linker.is_some())
-                    && target_default_linker_linux.is_some()
-                {
-                    panic!(
-                        "cannot set both `default-linker` and `default-linker-linux` for target {triple}"
-                    );
-                }
-                if !triple.contains("linux") {
-                    panic!(
-                        "`default-linker-linux` can only be set for Linux targets, not for {triple}"
-                    );
-                }
-                if target_default_linker_linux.as_ref()
-                    == Some(&DefaultLinuxLinkerOverride::SelfContainedLldCc)
-                    && !lld_enabled
-                {
-                    panic!(
-                        "Trying to override the default Linux linker for {triple} to be self-contained LLD, but LLD is not being built. Enable it with rust.lld = true."
-                    );
+                if let Some(linux_override) = target_default_linker_linux.as_ref() {
+                    if target_default_linker.is_some() || rust_default_linker.is_some() {
+                        panic!(
+                            "cannot set both `default-linker` and `default-linker-linux` for target {triple}"
+                        );
+                    }
+                    if !triple.contains("linux") {
+                        panic!(
+                            "`default-linker-linux` can only be set for Linux targets, not for {triple}"
+                        );
+                    }
+                    match linux_override {
+                        DefaultLinuxLinkerOverride::SelfContainedLldCc => {
+                            if !lld_enabled {
+                                panic!(
+                                    "Trying to override the default Linux linker for {triple} to be self-contained LLD, but LLD is not being built. Enable it with rust.lld = true."
+                                );
+                            }
+                        }
+                    }
                 }
 
                 if let Some(ref s) = target_llvm_config {