about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-10-01 16:13:04 +0800
committerGitHub <noreply@github.com>2018-10-01 16:13:04 +0800
commit7014afcfa1d46c6a888f4d09591650c4af7986fd (patch)
treee7d4c645614ae48bcf56a8773c6fd54b2cd0b814 /src/bootstrap
parent23a993c8c9da91058042499d3836e3f8481395eb (diff)
parentb3157601b1dbb231b9725b17580f89475dde9b88 (diff)
downloadrust-7014afcfa1d46c6a888f4d09591650c4af7986fd.tar.gz
rust-7014afcfa1d46c6a888f4d09591650c4af7986fd.zip
Rollup merge of #54681 - alexcrichton:san-names, r=kennytm
Rename sanitizer runtime libraries on OSX

Currently we ship sanitizer libraries as they're built, but these names
unfortunately conflict with the names of the sanitizer libraries
installed on the system. If a crate, for example, links in C code that
wants to use the system sanitizer and the Rust code doesn't use
sanitizers at all, then using `cargo` may accidentally pull in the
Rust-installed sanitizer library due to a conflict in names.

This change is intended to be entirely transparent for Rust users of
sanitizers, it should only hopefully improve our story with other users!

Closes #54134
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/compile.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 608f2c982c2..7d235743c2c 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -249,7 +249,7 @@ impl Step for StdLink {
 
 fn copy_apple_sanitizer_dylibs(builder: &Builder, native_dir: &Path, platform: &str, into: &Path) {
     for &sanitizer in &["asan", "tsan"] {
-        let filename = format!("libclang_rt.{}_{}_dynamic.dylib", sanitizer, platform);
+        let filename = format!("lib__rustc__clang_rt.{}_{}_dynamic.dylib", sanitizer, platform);
         let mut src_path = native_dir.join(sanitizer);
         src_path.push("build");
         src_path.push("lib");