diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-09-13 12:27:26 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-09-13 12:27:26 -0700 |
| commit | 848cfe20a01b3d43d4c9838bd7d9b0da32dace42 (patch) | |
| tree | 81fc8a0b269c46394dee3ec2b128a8da8ce05f83 | |
| parent | 265620225d2fa122c27bb6221bf5afe1797e9e6e (diff) | |
| download | rust-848cfe20a01b3d43d4c9838bd7d9b0da32dace42.tar.gz rust-848cfe20a01b3d43d4c9838bd7d9b0da32dace42.zip | |
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.
| -rw-r--r-- | src/libcompiler_builtins/lib.rs | 5 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/test/run-make/no-duplicate-libs/bar.rs | 3 | ||||
| -rw-r--r-- | src/test/run-make/no-duplicate-libs/foo.rs | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/libcompiler_builtins/lib.rs b/src/libcompiler_builtins/lib.rs index ad1d1edbeba..fbcf5204d25 100644 --- 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 d227fb1404f..115a24fc83c 100644 --- 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 8a15afb328a..b82fdeb8f36 100644 --- 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 ab8d2eca936..cbdee356838 100644 --- 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() {} |