diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2019-05-20 11:00:34 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2019-05-22 07:46:36 -0700 |
| commit | e59f0cc0d33f3098a883661227c0c14def403cfd (patch) | |
| tree | db105ba1cbd8c60bbdcca29cb40fc2171204f63e /src/libprofiler_builtins | |
| parent | 37ff5d388f8c004ca248adb635f1cc84d347eda0 (diff) | |
| download | rust-e59f0cc0d33f3098a883661227c0c14def403cfd.tar.gz rust-e59f0cc0d33f3098a883661227c0c14def403cfd.zip | |
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.
Diffstat (limited to 'src/libprofiler_builtins')
| -rw-r--r-- | src/libprofiler_builtins/build.rs | 4 |
1 files changed, 1 insertions, 3 deletions
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 { |