From d605e1d055dfd31b03e6e0da634928d4d5418866 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 2 Dec 2018 13:27:12 +0100 Subject: explicitly control compiler_builts/c feature from libstd --- src/libstd/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libstd') diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index c1446218367..9c2c1cab015 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" } +compiler_builtins = { path = "../rustc/compiler_builtins_shim", features = ["c"] } profiler_builtins = { path = "../libprofiler_builtins", optional = true } unwind = { path = "../libunwind" } -- cgit 1.4.1-3-g733a5 From bd20718c8f14cc7f486e1556f7d7897f8f32725b Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 2 Dec 2018 13:33:00 +0100 Subject: make the C part of compiler-builtins opt-out --- src/libstd/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/libstd') 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"] -- cgit 1.4.1-3-g733a5