From 713cf373c118517ec2638c4af1b73deceae4d4e0 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Fri, 12 Sep 2014 10:46:50 -0400 Subject: [PATCH] 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. --- mk/crates.mk | 2 +- src/librlibc/lib.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/crates.mk b/mk/crates.mk index c0fd04401bc..0011a7245e5 100644 --- a/mk/crates.mk +++ b/mk/crates.mk @@ -59,7 +59,7 @@ CRATES := $(TARGET_CRATES) $(HOST_CRATES) TOOLS := compiletest rustdoc rustc DEPS_core := -DEPS_rlibc := +DEPS_rlibc := core DEPS_unicode := core DEPS_alloc := core libc native:jemalloc DEPS_debug := std diff --git a/src/librlibc/lib.rs b/src/librlibc/lib.rs index 2ab7a6c52fa..c24a7e9ca77 100644 --- a/src/librlibc/lib.rs +++ b/src/librlibc/lib.rs @@ -35,12 +35,13 @@ // LLVM to optimize these function calls to themselves! #![no_builtins] +#[phase(plugin, link)] extern crate core; + #[cfg(test)] extern crate native; #[cfg(test)] extern crate test; #[cfg(test)] extern crate debug; #[cfg(test)] #[phase(plugin, link)] extern crate std; -#[cfg(test)] #[phase(plugin, link)] extern crate core; // Require the offset intrinsics for LLVM to properly optimize the // implementations below. If pointer arithmetic is done through integers the