diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2021-02-01 14:29:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 14:29:47 +0100 |
| commit | b3339ab8283d173ffd4bcbacaf799b50d3dbcdff (patch) | |
| tree | db6e26df4f3f761d8665e34c32c92de38adeacf1 /compiler/rustc_codegen_cranelift/src/bin | |
| parent | 26222272080d179b4f0a5ffe057d07d7341de041 (diff) | |
| parent | 27855331e8fc27163bac49c9dc10ab0fe6a04d5a (diff) | |
| download | rust-b3339ab8283d173ffd4bcbacaf799b50d3dbcdff.tar.gz rust-b3339ab8283d173ffd4bcbacaf799b50d3dbcdff.zip | |
Rollup merge of #81618 - bjorn3:sync_cg_clif-2021-02-01, r=bjorn3
Sync rustc_codegen_cranelift The highlight of this sync are abi compatibility with cg_llvm allowing mixing of cg_clif and cg_llvm compiled crates and switching to the x64 cranelift backend based on the new backend framework. r? ``@ghost`` ``@rustbot`` label +A-codegen +A-cranelift +T-compiler
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/bin')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/bin/cg_clif_build_sysroot.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/bin/cg_clif_build_sysroot.rs b/compiler/rustc_codegen_cranelift/src/bin/cg_clif_build_sysroot.rs index 8ee4cd46c94..83e5dc6e672 100644 --- a/compiler/rustc_codegen_cranelift/src/bin/cg_clif_build_sysroot.rs +++ b/compiler/rustc_codegen_cranelift/src/bin/cg_clif_build_sysroot.rs @@ -53,10 +53,7 @@ impl rustc_driver::Callbacks for CraneliftPassesCallbacks { .unwrap() .parent() .unwrap() - .parent() - .unwrap() - .join("build_sysroot") - .join("sysroot"), + .to_owned(), ); } } |