Link test to compiler builtins and make unstable

This commit fixes a test which now needs to explicitly link to the
`compiler_builtins` crate as well as makes the `compiler_builtins` crate
unstable.

diff --git a/src/libcompiler_builtins/lib.rs b/src/libcompiler_builtins/lib.rs
index ad1d1edbeba29bcd0a148c1c570e1cc83637deba..fbcf5204d2537df68196083b55dd94bc5ec83241 100644 (file)
--- a/src/libcompiler_builtins/lib.rs
+++ b/src/libcompiler_builtins/lib.rs
@@ -11,6 +11,9 @@
 #![cfg_attr(not(stage0), feature(compiler_builtins))]
 #![no_std]
 #![cfg_attr(not(stage0), compiler_builtins)]
-
+#![unstable(feature = "compiler_builtins_lib",
+            reason = "internal implementation detail of rustc right now",
+            issue = "0")]
 #![crate_name = "compiler_builtins"]
 #![crate_type = "rlib"]
+#![feature(staged_api)]

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index d227fb1404f47219e0666caf92b9c13b42341ee9..115a24fc83c22366b2d3a1bcfad69aac90cd2ef8 100644 (file)
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -224,6 +224,7 @@
 #![feature(char_internals)]
 #![feature(collections)]
 #![feature(collections_bound)]
+#![feature(compiler_builtins_lib)]
 #![feature(const_fn)]
 #![feature(core_float)]
 #![feature(core_intrinsics)]

diff --git a/src/test/run-make/no-duplicate-libs/bar.rs b/src/test/run-make/no-duplicate-libs/bar.rs
index 8a15afb328a92fd383337bdef39c68275586deca..b82fdeb8f3696e7a2efa66825f5c80e6a24a85b8 100644 (file)
--- a/src/test/run-make/no-duplicate-libs/bar.rs
+++ b/src/test/run-make/no-duplicate-libs/bar.rs
@@ -8,11 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(lang_items, libc)]
+#![feature(lang_items, libc, compiler_builtins_lib)]
 #![crate_type = "dylib"]
 #![no_std]
 
 extern crate libc;
+extern crate compiler_builtins;
 
 #[no_mangle]
 pub extern fn bar() {}

diff --git a/src/test/run-make/no-duplicate-libs/foo.rs b/src/test/run-make/no-duplicate-libs/foo.rs
index ab8d2eca9363f55c52c9a53b166c79cff1e601bf..cbdee356838de80ae6d918793d1f8b429da757d9 100644 (file)
--- a/src/test/run-make/no-duplicate-libs/foo.rs
+++ b/src/test/run-make/no-duplicate-libs/foo.rs
@@ -8,11 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(lang_items, libc)]
+#![feature(lang_items, libc, compiler_builtins_lib)]
 #![no_std]
 #![crate_type = "dylib"]
 
 extern crate libc;
+extern crate compiler_builtins;
 
 #[no_mangle]
 pub extern fn foo() {}