Skip to content

Conversation

@Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Apr 27, 2017

Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.

Keruspe added 4 commits April 27, 2017 11:52
Build them directly in the `./x.py build` phase, don't wait for
`./x.py dist`

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

This way its files take precedence (e.g. README.md and stuff)

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@alexcrichton
Copy link
Member

@bors: r+

Looks good to me, thanks!

@bors
Copy link
Collaborator

bors commented Apr 27, 2017

📌 Commit 7b1fb89 has been approved by alexcrichton

@Keruspe
Copy link
Contributor Author

Keruspe commented Apr 27, 2017

Should I submit that to the beta branch too?

@alexcrichton
Copy link
Member

We typically try to be conservative with backports (limited to bug fixes) as opposed to new features, but if you'd like a backport if you wouldn't mind expanding on the rationale I can tag this for discussion with the appropriate team.

@Keruspe
Copy link
Contributor Author

Keruspe commented Apr 27, 2017

Well, I use these for packaging rust downstream for Exherbo, but I'm fine with doing the backport downstream for a couple of months

@alexcrichton
Copy link
Member

Ok if that's ok with you I'll avoid the backport tag for now, but if that doesn't work we can still consider backporting!

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 27, 2017
rustbuild improvements

Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.
@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 27, 2017
@alexcrichton
Copy link
Member

@bors: r-

Ah I think this caused a failure

[01:18:29] thread 'main' panicked at 'don't know how to configure OpenSSL for aarch64-apple-ios', src/bootstrap/native.rs:333

[01:18:29] note: Run with `RUST_BACKTRACE=1` for a backtrace.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@Keruspe
Copy link
Contributor Author

Keruspe commented Apr 28, 2017

I guess it makes sense to only build cargo for the host, like we do for rls. This should fix the failure.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Apr 28, 2017

📌 Commit a8c6ba9 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 29, 2017

⌛ Testing commit a8c6ba9 with merge 95467d3...

bors added a commit that referenced this pull request Apr 29, 2017
rustbuild improvements

Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.
@bors
Copy link
Collaborator

bors commented Apr 29, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 95467d3 to master...

@bors bors merged commit a8c6ba9 into rust-lang:master Apr 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants