From d605e1d055dfd31b03e6e0da634928d4d5418866 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 2 Dec 2018 13:27:12 +0100 Subject: [PATCH 1/2] explicitly control compiler_builts/c feature from libstd --- src/libstd/Cargo.toml | 2 +- src/rustc/compiler_builtins_shim/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index c1446218367e4..9c2c1cab01584 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" } diff --git a/src/rustc/compiler_builtins_shim/Cargo.toml b/src/rustc/compiler_builtins_shim/Cargo.toml index 7d8423ca84eb4..9804177280f66 100644 --- a/src/rustc/compiler_builtins_shim/Cargo.toml +++ b/src/rustc/compiler_builtins_shim/Cargo.toml @@ -34,7 +34,7 @@ cc = "1.0.1" [features] c = [] -default = ["c", "rustbuild", "compiler-builtins"] +default = ["rustbuild", "compiler-builtins"] mem = [] rustbuild = [] compiler-builtins = [] From bd20718c8f14cc7f486e1556f7d7897f8f32725b Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 2 Dec 2018 13:33:00 +0100 Subject: [PATCH 2/2] make the C part of compiler-builtins opt-out --- src/libstd/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 9c2c1cab01584..cae2f405318be 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"]