Skip to content

rustbuild improvements - #41577

Merged
bors merged 6 commits into
rust-lang:masterfrom
Keruspe:master
Apr 29, 2017
Merged

rustbuild improvements#41577
bors merged 6 commits into
rust-lang:masterfrom
Keruspe:master

Conversation

@Keruspe

@KeruspeKeruspe commented Apr 27, 2017

Copy link
Copy Markdown
Contributor

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

@Keruspe
rustbuild: build cargo and rls as part of extended build
f592903
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>
@Keruspe
rustbuild: pass version number as param in install phase
c4c3b5a
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@Keruspe
rustbuild: add rls_package_vers
a2bab1d
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@Keruspe
rustbuild: install cargo and rls when extended build is enabled
03c5797
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive

rust-highfive commented Apr 27, 2017

Copy link
Copy Markdown
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.

@Keruspe
rustbuild: install rustc after cargo and rls
7b1fb89
This way its files take precedence (e.g. README.md and stuff)
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@alexcrichton

alexcrichton commented Apr 27, 2017

Copy link
Copy Markdown
Member

@bors: r+

Looks good to me, thanks!

@bors

bors commented Apr 27, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 7b1fb89 has been approved by alexcrichton

@Keruspe

Keruspe commented Apr 27, 2017

Copy link
Copy Markdown
ContributorAuthor

Should I submit that to the beta branch too?

@alexcrichton

alexcrichton commented Apr 27, 2017

Copy link
Copy Markdown
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

Keruspe commented Apr 27, 2017

Copy link
Copy Markdown
ContributorAuthor

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

alexcrichton commented Apr 27, 2017

Copy link
Copy Markdown
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!

@arielb1arielb1 mentioned this pull request Apr 27, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 27, 2017
@frewsxcv
Rollup merge ofrust-lang#41577- Keruspe:master, r=alexcrichton
9c44dc3
rustbuild improvements
Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.
@frewsxcvfrewsxcv mentioned this pull request Apr 27, 2017
Closed
@alexcrichtonalexcrichton 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

alexcrichton commented Apr 27, 2017

Copy link
Copy Markdown
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.

@Keruspe
rustbuild: only build cargo for host
a8c6ba9
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@Keruspe

Keruspe commented Apr 28, 2017

Copy link
Copy Markdown
ContributorAuthor

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

@alexcrichton

alexcrichton commented Apr 28, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Apr 28, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit a8c6ba9 has been approved by alexcrichton

@frewsxcvfrewsxcv mentioned this pull request Apr 28, 2017
Closed
@bors

bors commented Apr 29, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a8c6ba9 with merge 95467d3...

bors added a commit that referenced this pull request Apr 29, 2017
@bors
Auto merge of#41577- Keruspe:master, r=alexcrichton
95467d3
rustbuild improvements
Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.
@bors

bors commented Apr 29, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit a8c6ba9 into rust-lang:masterApr 29, 2017
@borsbors mentioned this pull request Apr 29, 2017
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Keruspe@rust-highfive@alexcrichton@bors