diff options
| author | bors <bors@rust-lang.org> | 2023-07-17 15:46:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-17 15:46:43 +0000 |
| commit | c4e6fe9240a8aaff8e7eb42acc4cab33fe2e3707 (patch) | |
| tree | a5cc8875633430f6237b01ab19372c56c693087e /compiler | |
| parent | b3c7a7e749761b61ee587fda5fa24aae444865e9 (diff) | |
| parent | e95caa7b7276a9b7d57fb5cea544176d70623db5 (diff) | |
| download | rust-c4e6fe9240a8aaff8e7eb42acc4cab33fe2e3707.tar.gz rust-c4e6fe9240a8aaff8e7eb42acc4cab33fe2e3707.zip | |
Auto merge of #113714 - Kobzol:ci-cmake, r=nikic
CI: build CMake 3.20 to support LLVM 17 LLVM 17 will require CMake at least 3.20, so we have to go back to building our own CMake on the Linux x64 dist builder. r? `@nikic`
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_llvm/build.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs index b0783d75d47..aa1121d6bb3 100644 --- a/compiler/rustc_llvm/build.rs +++ b/compiler/rustc_llvm/build.rs @@ -251,8 +251,11 @@ 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") || target.contains("darwin") { + } else if target.contains("haiku") || target.contains("darwin") { println!("cargo:rustc-link-lib=z"); + } else if target.contains("netbsd") { + println!("cargo:rustc-link-lib=z"); + println!("cargo:rustc-link-lib=execinfo"); } cmd.args(&components); |