Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 75 additions & 2 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/bootstrap/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ pub fn std_cargo(build: &Build,
features.push_str(" force_alloc_system");
}

features.push_str(" rustc_llvm/rebuild_bindings");

if compiler.stage != 0 && build.config.sanitizers {
// This variable is used by the sanitizer runtime crates, e.g.
// rustc_lsan, to build the sanitizer runtime from C code
Expand Down
10 changes: 4 additions & 6 deletions src/librustc_llvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ path = "lib.rs"
crate-type = ["dylib"]

[features]
static-libstdcpp = []

[dependencies]
bitflags = "1.0"
rustc_cratesio_shim = { path = "../librustc_cratesio_shim" }
rebuild-bindings = ["bindgen"]

[build-dependencies]
build_helper = { path = "../build_helper" }
# https://github.com/rust-lang-nursery/rust-bindgen/pull/1162.
bindgen = { git = "https://github.com/rust-lang-nursery/rust-bindgen.git", rev = "75f9e1c", optional = true }
cc = "1.0.1"
build_helper = { path = "../build_helper" }
1 change: 1 addition & 0 deletions src/librustc_llvm/archive_ro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ impl<'a> Iterator for Iter<'a> {
if ptr.is_null() {
::last_error().map(Err)
} else {
let ptr = ptr as *mut _;
Some(Ok(Child {
ptr,
_data: marker::PhantomData,
Expand Down
Loading