Rollup merge of #86072 - MarcusCalhoun-Lopez:llvm_cross, r=nagisa

JohnTitor · web-flow · commit 9391d5520478 · 2021-07-31T04:09:19.000+09:00
Cross compiling rustc_llvm on Darwin requires zlib.
diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
@@ -182,7 +182,7 @@ fn main() {
     } else if target.contains("windows-gnu") {
         println!("cargo:rustc-link-lib=shell32");
         println!("cargo:rustc-link-lib=uuid");
-    } else if target.contains("netbsd") || target.contains("haiku") {
+    } else if target.contains("netbsd") || target.contains("haiku") || target.contains("darwin") {
         println!("cargo:rustc-link-lib=z");
     }
     cmd.args(&components);

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ fn main() {`
`182`	`182`	`} else if target.contains("windows-gnu") {`
`183`	`183`	`println!("cargo:rustc-link-lib=shell32");`
`184`	`184`	`println!("cargo:rustc-link-lib=uuid");`
`185`		`- } else if target.contains("netbsd") \|\| target.contains("haiku") {`
	`185`	`+ } else if target.contains("netbsd") \|\| target.contains("haiku") \|\| target.contains("darwin") {`
`186`	`186`	`println!("cargo:rustc-link-lib=z");`
`187`	`187`	`}`
`188`	`188`	`cmd.args(&components);`