]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f43ac06 fe6d626)
Auto merge of #64254 - aleksijuvani:fix-macos-sysroot, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 13 Sep 2019 09:19:43 +0000 (09:19 +0000)
committerbors <bors@rust-lang.org>
Fri, 13 Sep 2019 09:19:43 +0000 (09:19 +0000)
Fix sysroot on macOS when cross-compiling and SDKROOT is set

Fixes rust-lang/cargo#7283
Closes rust-lang/cargo#7284

r? @alexcrichton

1  2 
src/librustc_codegen_ssa/back/command.rs patch | diff1 | diff2 | blob | history
src/librustc_codegen_ssa/back/link.rs patch | diff1 | diff2 | blob | history
src/librustc_target/spec/mod.rs patch | diff1 | diff2 | blob | history

diff --cc src/librustc_codegen_ssa/back/link.rs
Simple merge
diff --cc src/librustc_target/spec/mod.rs
Simple merge
Empowering everyone to build reliable and efficient software.