Skip to content

Commit 713cf37

Browse files
committed
Take core as a dependency on librlibc. This is needed so that it can
see the lang-items for Sized etc. @acrichto and @thestinger had no objections.
1 parent b88f867 commit 713cf37

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

mk/crates.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5959
TOOLS := compiletest rustdoc rustc
6060

6161
DEPS_core :=
62-
DEPS_rlibc :=
62+
DEPS_rlibc := core
6363
DEPS_unicode := core
6464
DEPS_alloc := core libc native:jemalloc
6565
DEPS_debug := std

src/librlibc/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535
// LLVM to optimize these function calls to themselves!
3636
#![no_builtins]
3737

38+
#[phase(plugin, link)] extern crate core;
39+
3840
#[cfg(test)] extern crate native;
3941
#[cfg(test)] extern crate test;
4042
#[cfg(test)] extern crate debug;
4143

4244
#[cfg(test)] #[phase(plugin, link)] extern crate std;
43-
#[cfg(test)] #[phase(plugin, link)] extern crate core;
4445

4546
// Require the offset intrinsics for LLVM to properly optimize the
4647
// implementations below. If pointer arithmetic is done through integers the

0 commit comments

Comments
 (0)