diff options
| author | bors <bors@rust-lang.org> | 2024-05-21 00:46:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-21 00:46:30 +0000 |
| commit | 8e7517d99a8aaab02b512483ae91f8b79553fa3d (patch) | |
| tree | 5ea87447eb3301f4f5248921740fef70842bfebd /compiler/rustc_codegen_llvm/src/back/archive.rs | |
| parent | 60faa271d9f11474caa68de6fe44ff502437f9e1 (diff) | |
| parent | 63fa01eb094a5894fb3d9c776426749c8372f94e (diff) | |
| download | rust-8e7517d99a8aaab02b512483ae91f8b79553fa3d.tar.gz rust-8e7517d99a8aaab02b512483ae91f8b79553fa3d.zip | |
Auto merge of #125349 - matthiaskrgr:rollup-p2mbdxi, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #124050 (Remove libc from MSVC targets) - #124283 (Note for E0599 if shadowed bindings has the method.) - #125123 (Fix `read_exact` and `read_buf_exact` for `&[u8]` and `io:Cursor`) - #125158 (hir pretty: fix block indent) - #125308 (track cycle participants per root) - #125332 (Update books) - #125333 (switch to the default implementation of `write_vectored`) - #125346 (Remove some `Path::to_str` from `rustc_codegen_llvm`) Failed merges: - #125310 (Move ~100 tests from tests/ui to subdirs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back/archive.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index d4a3e39cef7..c304c0cbd3b 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -200,21 +200,20 @@ impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder { _ => panic!("unsupported arch {}", sess.target.arch), }; let mut dlltool_cmd = std::process::Command::new(&dlltool); - dlltool_cmd.args([ - "-d", - def_file_path.to_str().unwrap(), - "-D", - lib_name, - "-l", - output_path.to_str().unwrap(), - "-m", - dlltool_target_arch, - "-f", - dlltool_target_bitness, - "--no-leading-underscore", - "--temp-prefix", - temp_prefix.to_str().unwrap(), - ]); + dlltool_cmd + .arg("-d") + .arg(def_file_path) + .arg("-D") + .arg(lib_name) + .arg("-l") + .arg(&output_path) + .arg("-m") + .arg(dlltool_target_arch) + .arg("-f") + .arg(dlltool_target_bitness) + .arg("--no-leading-underscore") + .arg("--temp-prefix") + .arg(temp_prefix); match dlltool_cmd.output() { Err(e) => { |
