fix after rebase

Author: mati865

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1419,9 +1419,9 @@ pub fn linker_and_flavor(
     }
 
     // When using a supported target in self-contained linker mode, we want to use rust-lld directly.
-    let self_contained_target = sess.target.os == "windows"
-        && sess.target.env == "gnu"
-        && sess.target.abi == "llvm"
+    let self_contained_target = sess.target.os == Os::Windows
+        && sess.target.env == Env::Gnu
+        && sess.target.abi == Abi::Llvm
         && self_contained_components.is_linker_enabled();
     if self_contained_target
         && let Some(ret) =
@@ -1784,7 +1784,7 @@ fn detect_self_contained_mingw(sess: &Session) -> bool {
     // Passing custom linker means non-self-contained mode.
     if sess.opts.cg.linker.is_some() {
         // Unless running on `-windows-gnu-llvm` and using `-C linker=rust-lld`.
-        if sess.target.abi == "llvm" {
+        if sess.target.abi == Abi::Llvm {
             return sess
                 .opts
                 .cg