Skip to content
This repository has been archived by the owner on Dec 9, 2018. It is now read-only.

Update patches for current Rust #14

Closed
wants to merge 6 commits into from

Conversation

geofft
Copy link

@geofft geofft commented Aug 31, 2015

First: this project is pretty awesome.

I've updated cargo-ify.patch and optional-backtrace.patch to apply cleanly to current Rust master and compile successfully (at least when native-building on x86_64). Fortunately that consists primarily of removing code.

I didn't update optional-jemalloc.patch, because the entirety of the code that's being patched got removed in rust-lang/rust#27400. But as a result of that change, you can now force the use of the system allocator using just standard (unstable) Rust by adding

#![feature(alloc_system)]
extern crate alloc_system;

This doesn't support dynamically-linking jemalloc, though. I imagine the current patch could be ported to the new alloc_jemalloc crate.

remove-mno-compact-eh-flag.patch still applies cleanly, so it's unchanged.

I am not actually able to (native-)build a project depending on my resulting libstd using cargo; I get duplicate definitions of all the lang-items, even if I attempt to use #![no_std] and an explicit extern crate std. But I'm not sure that's related.

On the functionality side, morestack is gone (rust-lang/rust#27338), and
rustrt_native is gone (rust-lang/rust#27176).

On the implementation side, connect has been renamed to join
(rust-lang/rust#26957).
No changes other than updating diff context.
rust-lang/rust#27176 "removes LLVM as a build-time dependency of the
standard library. This may end up becoming very useful if we move
towards building the standard library with Cargo."
This allows Travis to test patches in incoming PRs, but is also
generically useful.
@geofft
Copy link
Author

geofft commented Aug 31, 2015

OK, looks like I'll need to deal with jemalloc to make tests pass. Lemme do that and then resubmit this PR.

@geofft geofft closed this Aug 31, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant