Skip to content

Commit

Permalink
Link test to compiler builtins and make unstable
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
alexcrichton committed Sep 13, 2016
1 parent 2656202 commit 848cfe2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/libcompiler_builtins/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
1 change: 1 addition & 0 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
3 changes: 2 additions & 1 deletion src/test/run-make/no-duplicate-libs/bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand Down
3 changes: 2 additions & 1 deletion src/test/run-make/no-duplicate-libs/foo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand Down

0 comments on commit 848cfe2

Please sign in to comment.