diff options
| -rw-r--r-- | src/Cargo.lock | 16 | ||||
| -rw-r--r-- | src/bootstrap/dist.rs | 12 | ||||
| m--------- | src/tools/clippy | 28 |
3 files changed, 40 insertions, 16 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index a4f9082c284..fc2dfcfd860 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -296,12 +296,14 @@ version = "0.0.212" dependencies = [ "cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "clippy-mini-macro-test 0.2.0", + "clippy_dev 0.0.1", "clippy_lints 0.0.212", "compiletest_rs 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0", + "rustc_tools_util 0.1.0", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)", @@ -312,6 +314,16 @@ name = "clippy-mini-macro-test" version = "0.2.0" [[package]] +name = "clippy_dev" +version = "0.0.1" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "clippy_lints" version = "0.0.212" dependencies = [ @@ -2362,6 +2374,10 @@ dependencies = [ ] [[package]] +name = "rustc_tools_util" +version = "0.1.0" + +[[package]] name = "rustc_traits" version = "0.0.0" dependencies = [ diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index c3282275f6f..167e4a78eda 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1902,6 +1902,16 @@ fn maybe_install_llvm_dylib(builder: &Builder, let src_libdir = builder .llvm_out(target) .join("lib"); + let dst_libdir = image.join("lib/rustlib").join(&*target).join("lib"); + t!(fs::create_dir_all(&dst_libdir)); + + if target.contains("apple-darwin") { + let llvm_dylib_path = src_libdir.join("libLLVM.dylib"); + if llvm_dylib_path.exists() { + builder.install(&llvm_dylib_path, &dst_libdir, 0o644); + } + return + } // Usually libLLVM.so is a symlink to something like libLLVM-6.0.so. // Since tools link to the latter rather than the former, we have to @@ -1913,8 +1923,6 @@ fn maybe_install_llvm_dylib(builder: &Builder, llvm_dylib_path.display(), e); }); - let dst_libdir = image.join("lib/rustlib").join(&*target).join("lib"); - t!(fs::create_dir_all(&dst_libdir)); builder.install(&llvm_dylib_path, &dst_libdir, 0o644); } diff --git a/src/tools/clippy b/src/tools/clippy -Subproject 131c8f86b2b712d4d9b00f486b6c67f97782228 +Subproject cafef7b576203f166add9ed143979d9775c2521 |