From: Ralf Jung <post@ralfj.de>
Date: Sun, 2 Dec 2018 12:33:00 +0000 (+0100)
Subject: make the C part of compiler-builtins opt-out
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=bd20718c8f14cc7f486e1556f7d7897f8f32725b;p=rust.git

make the C part of compiler-builtins opt-out
---

diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 9c2c1cab015..cae2f405318 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -18,7 +18,7 @@ panic_unwind = { path = "../libpanic_unwind", optional = true }
 panic_abort = { path = "../libpanic_abort" }
 core = { path = "../libcore" }
 libc = { path = "../rustc/libc_shim" }
-compiler_builtins = { path = "../rustc/compiler_builtins_shim", features = ["c"] }
+compiler_builtins = { path = "../rustc/compiler_builtins_shim" }
 profiler_builtins = { path = "../libprofiler_builtins", optional = true }
 unwind = { path = "../libunwind" }
 
@@ -43,9 +43,12 @@ cc = "1.0"
 build_helper = { path = "../build_helper" }
 
 [features]
+default = ["compiler_builtins_c"]
+
 backtrace = []
 panic-unwind = ["panic_unwind"]
 profiler = ["profiler_builtins"]
+compiler_builtins_c = ["compiler_builtins/c"]
 
 # Make panics and failed asserts immediately abort without formatting any message
 panic_immediate_abort = ["core/panic_immediate_abort"]