Merge pull request #65 from japaric/nightly

support the newest nightly

Author: japaric

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.3.15] - 2018-04-08
+
+### Fixed
+
+- Support the newest nightly
+
 ## [v0.3.14] - 2018-04-01
 
 ### Fixed
@@ -238,7 +244,8 @@ section                size        addr
 
 Initial release
 
-[Unreleased]: https://github.com/japaric/cortex-m-rt/compare/v0.3.14...HEAD
+[Unreleased]: https://github.com/japaric/cortex-m-rt/compare/v0.3.15...HEAD
+[v0.3.15]: https://github.com/japaric/cortex-m-rt/compare/v0.3.14...v0.3.15
 [v0.3.14]: https://github.com/japaric/cortex-m-rt/compare/v0.3.13...v0.3.14
 [v0.3.13]: https://github.com/japaric/cortex-m-rt/compare/v0.3.12...v0.3.13
 [v0.3.12]: https://github.com/japaric/cortex-m-rt/compare/v0.3.11...v0.3.12

Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["arm", "cortex-m", "runtime", "startup"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-rt"
 repository = "https://github.com/japaric/cortex-m-rt"
-version = "0.3.14"
+version = "0.3.15"
 
 [dependencies]
 cortex-m = "0.3.0"

build.rs

@@ -10,13 +10,19 @@ use chrono::NaiveDate;
 
 fn main() {
     let meta = rustc_version::version_meta().unwrap();
+    let commit_date = meta.commit_date.unwrap().parse::<NaiveDate>().unwrap();
     if meta.channel == rustc_version::Channel::Dev
-        || meta.commit_date.unwrap().parse::<NaiveDate>().unwrap()
-            > NaiveDate::from_ymd(2017, 12, 26)
+        || commit_date > NaiveDate::from_ymd(2017, 12, 26)
     {
         println!("cargo:rustc-cfg=has_termination_lang")
     }
 
+    // newest nightlies don't need 'extern crate compiler_builtins'
+    if commit_date < NaiveDate::from_ymd(2018, 04, 07)
+    {
+        println!("cargo:rustc-cfg=needs_cb")
+    }
+
     let target = env::var("TARGET").unwrap();
 
     has_fpu(&target);

src/lib.rs

@@ -485,14 +485,15 @@
 #![deny(missing_docs)]
 #![deny(warnings)]
 #![feature(asm)]
-#![feature(compiler_builtins_lib)]
+#![cfg_attr(needs_cb, feature(compiler_builtins_lib))]
 #![feature(global_asm)]
 #![feature(lang_items)]
 #![feature(linkage)]
 #![feature(naked_functions)]
 #![feature(used)]
 #![no_std]
 
+#[cfg(needs_cb)]
 extern crate compiler_builtins;
 #[cfg(target_arch = "arm")]
 extern crate cortex_m;