From e59f0cc0d33f3098a883661227c0c14def403cfd Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 20 May 2019 11:00:34 -0700 Subject: Bump compiler-builtins to 0.1.15 This commit bumps the `compiler-builtins` dependency to 0.1.15 which expects to have the source for `compiler-rt` provided externally if the `c` feature is enabled. This then plumbs through the necessary support in the build system to ensure that if the `llvm-project` directory is checked out and present that we enable the `c` feature of `compiler-builtins` and compile in all the C intrinsics. --- src/libprofiler_builtins/build.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/libprofiler_builtins') diff --git a/src/libprofiler_builtins/build.rs b/src/libprofiler_builtins/build.rs index 331edb73d6d..491986480de 100644 --- a/src/libprofiler_builtins/build.rs +++ b/src/libprofiler_builtins/build.rs @@ -57,9 +57,7 @@ fn main() { cfg.define("COMPILER_RT_HAS_ATOMICS", Some("1")); } - // The source for `compiler-rt` comes from the `compiler-builtins` crate, so - // load our env var set by cargo to find the source code. - let root = env::var_os("DEP_COMPILER_RT_COMPILER_RT").unwrap(); + let root = env::var_os("RUST_COMPILER_RT_ROOT").unwrap(); let root = Path::new(&root); for src in profile_sources { -- cgit 1.4.1-3-g733a5