auto merge of #14633 : huonw/rust/nodylibc, r=alexcrichton

libc: only provide an rlib.

There's absolutely no reason for `libc` to be offered as a dynamic
library.
This commit is contained in:
bors 2014-06-04 15:26:50 -07:00
commit aa09561bb6
3 changed files with 9 additions and 1 deletions

View File

@ -101,6 +101,7 @@ TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
ONLY_RLIB_core := 1
ONLY_RLIB_libc := 1
ONLY_RLIB_rlibc := 1
ONLY_RLIB_alloc := 1
ONLY_RLIB_rand := 1

View File

@ -14,7 +14,6 @@
#![no_std] // we don't need std, and we can't have std, since it doesn't exist
// yet. std depends on us.
#![crate_type = "rlib"]
#![crate_type = "dylib"]
/*!
* Bindings for the C standard library and other platform libraries
@ -4436,4 +4435,7 @@ pub mod funcs {
}
}
#[doc(hidden)]
pub fn issue_14344_workaround() {} // FIXME #14344 force linkage to happen correctly
#[test] fn work_on_windows() { } // FIXME #10872 needed for a happy windows

View File

@ -254,6 +254,11 @@ mod unicode;
#[unstable]
pub mod rt;
#[doc(hidden)]
pub fn issue_14344_workaround() { // FIXME #14344 force linkage to happen correctly
libc::issue_14344_workaround();
}
// A curious inner-module that's not exported that contains the binding
// 'std' so that macro-expanded references to std::error and such
// can be resolved within libstd.