Skip to content

Upstream #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Upstream #94

wants to merge 6 commits into from

Conversation

japaric
Copy link
Member

@japaric japaric commented Oct 6, 2016

Some changes required to make this repo compatible with the rust-lang/rust repo. Most changes don't cause problems except for the new explicit core dependency which has a relative path (../libcore) that breaks standalone builds of this crate 😞.

cc @alexcrichton Even though I marked the core dependency as optional with the hope that Cargo won't even look at the path which doesn't exist, it still does.

@alexcrichton
Copy link
Member

Perhaps we could take the route of libc? That way we'd leave the structure as-is here, but another Cargo.toml would be checked in to the rust-lang/rust repo (e.g. we wouldn't even use this repo's Cargo.toml during a bootstrap)

This is the libc_shim directory -- https://github.com/rust-lang/rust/tree/master/src/rustc/libc_shim

@homunkulus
Copy link
Contributor

☔ The latest upstream changes (presumably #80) made this pull request unmergeable. Please resolve the merge conflicts.

@japaric
Copy link
Member Author

japaric commented Oct 10, 2016

Closing in favor of #97

@japaric japaric closed this Oct 10, 2016
@alexcrichton alexcrichton deleted the upstream branch October 14, 2016 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants