about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2020-01-24 00:30:58 -0800
committerGitHub <noreply@github.com>2020-01-24 00:30:58 -0800
commit94aa655a3c7a9dde612b5e65e5e8ec3c57d143a3 (patch)
treee2a343848ec8c891f56fffc4aae764846ab9e4fc /src/bootstrap
parente7752aefdc0765f9350cbe5d563d6f46f9045e26 (diff)
parent192650a9aac7a2e006afbbafb83088eaf0d9d820 (diff)
downloadrust-94aa655a3c7a9dde612b5e65e5e8ec3c57d143a3.tar.gz
rust-94aa655a3c7a9dde612b5e65e5e8ec3c57d143a3.zip
Rollup merge of #68473 - nopsledder:rust_sanitizer_fuchsia, r=alexcrichton
Enable ASan on Fuchsia

This change adds the x86_64-fuchsia and aarch64-fuchsia LLVM targets to
those allowed to invoke -Zsanitizer. Currently, the only overlap between
compiler_rt sanitizers supported by both rustc and Fuchsia is ASan.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/native.rs18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 89e1a7319cf..5bbd9f47fc9 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -659,6 +659,24 @@ fn supported_sanitizers(out_dir: &Path, target: Interned<String>) -> Vec<Sanitiz
                 });
             }
         }
+        "x86_64-fuchsia" => {
+            for s in &["asan"] {
+                result.push(SanitizerRuntime {
+                    cmake_target: format!("clang_rt.{}-x86_64", s),
+                    path: out_dir.join(&format!("build/lib/fuchsia/libclang_rt.{}-x86_64.a", s)),
+                    name: format!("librustc_rt.{}.a", s),
+                });
+            }
+        }
+        "aarch64-fuchsia" => {
+            for s in &["asan"] {
+                result.push(SanitizerRuntime {
+                    cmake_target: format!("clang_rt.{}-aarch64", s),
+                    path: out_dir.join(&format!("build/lib/fuchsia/libclang_rt.{}-aarch64.a", s)),
+                    name: format!("librustc_rt.{}.a", s),
+                });
+            }
+        }
         _ => {}
     }
     result