diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-02 19:14:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 19:14:50 +0100 |
| commit | 03f01bbe901d60b71cf2c5ec766aef5e532ab79d (patch) | |
| tree | f766b683ac06d5d9cc912e1d59a4875693403e3f /src | |
| parent | 646b00ff7710fb9f8a1a6de744f38bdcb1c932d7 (diff) | |
| parent | 54b1d101efec3da791aee1f98fb26230e88b9a05 (diff) | |
| download | rust-03f01bbe901d60b71cf2c5ec766aef5e532ab79d.tar.gz rust-03f01bbe901d60b71cf2c5ec766aef5e532ab79d.zip | |
Merge pull request #1105 from bjorn3/test_rustc_bootstrapping
Test bootstrapping of rustc using cg_clif
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/cg_clif.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/bin/cg_clif.rs b/src/bin/cg_clif.rs index 6253022ade2..71ef4d22673 100644 --- a/src/bin/cg_clif.rs +++ b/src/bin/cg_clif.rs @@ -27,11 +27,13 @@ impl rustc_driver::Callbacks for CraneliftPassesCallbacks { config.opts.cg.panic = Some(PanicStrategy::Abort); config.opts.debugging_opts.panic_abort_tests = true; config.opts.maybe_sysroot = Some( - std::env::current_exe() - .unwrap() - .parent() - .unwrap() - .join("sysroot"), + config.opts.maybe_sysroot.clone().unwrap_or( + std::env::current_exe() + .unwrap() + .parent() + .unwrap() + .join("sysroot"), + ), ); } } |