Merge #604

604: Do not fail to compile if autocfg unable to determine rustc version r=taiki-e a=taiki-e `autocfg::new()` panics if unable to determine rustc version. However, that should not be a fatal error for the library. Co-authored-by: Taiki Endo <[email protected]>
crossbeam-rs · Nov 22, 2020 · ccbad40 · ccbad40
2 parents 3b14dec + d9ff1c2
commit ccbad40
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/crossbeam-utils/build.rs b/crossbeam-utils/build.rs
@@ -1,5 +1,20 @@
+use autocfg::AutoCfg;
+
+// The rustc-cfg strings below are *not* public API. Please let us know by
+// opening a GitHub issue if your build environment requires some way to enable
+// these cfgs other than by executing our build script.
 fn main() {
-    let cfg = autocfg::new();
+    let cfg = match AutoCfg::new() {
+        Ok(cfg) => cfg,
+        Err(e) => {
+            println!(
+                "cargo:warning=crossbeam-utils: unable to determine rustc version: {}",
+                e
+            );
+            return;
+        }
+    };
+
     cfg.emit_type_cfg("core::sync::atomic::AtomicU8", "has_atomic_u8");
     cfg.emit_type_cfg("core::sync::atomic::AtomicU16", "has_atomic_u16");
     cfg.emit_type_cfg("core::sync::atomic::AtomicU32", "has_atomic_u32");