about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2018-12-02 13:27:12 +0100
committerRalf Jung <post@ralfj.de>2018-12-02 13:27:12 +0100
commitd605e1d055dfd31b03e6e0da634928d4d5418866 (patch)
treeee72ae9c6a686d7b958e532c2cd8b235cc4b560a
parent0765eb95b5e9e15fc29aa7725a01621dfeca2649 (diff)
downloadrust-d605e1d055dfd31b03e6e0da634928d4d5418866.tar.gz
rust-d605e1d055dfd31b03e6e0da634928d4d5418866.zip
explicitly control compiler_builts/c feature from libstd
-rw-r--r--src/libstd/Cargo.toml2
-rw-r--r--src/rustc/compiler_builtins_shim/Cargo.toml2
2 files changed, 2 insertions, 2 deletions
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" }
 
diff --git a/src/rustc/compiler_builtins_shim/Cargo.toml b/src/rustc/compiler_builtins_shim/Cargo.toml
index 7d8423ca84e..9804177280f 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 = []