rustbuild: pass datadir to rust-installer #48295
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ |
|
📌 Commit a6f9f1e has been approved by |
bors
added
the
S-waiting-on-bors
|
Btw, would this be a good candidate for a beta backport? |
|
I think probably no since it's not really fixing any regressions in beta, and doesn't seem like a critical patch. This is strictly a "new" bug so to speak, right? Not something we regressed on? |
|
It kind of is as I got to that because I needed to change the prefix because of the removal of relative_libdir. But I totally get how that's non critical and I'm fine with keeping a workaround downstream for the time being |
|
Oh, in that case, yes, this seems like a viable candidate for a backport. The change is relatively small anyway. I've nominated. |
Mark-Simulacrum
added
the
beta-nominated
|
This can be rolled up. |
|
This changes Cargo.lock which is somewhat likely to cause conflicts so I'd prefer to not roll it up. |
alexcrichton
added
the
beta-accepted
|
☔ The latest upstream changes (presumably #48349) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
Rebased on top of current master |
|
@alexcrichton while at it, do you want me to pull in your compression change from rust-installer in the first commit? |
|
@bors: r+ Sure yeah feel free, but no worries if it happens later! |
|
📌 Commit a989ee9 has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #48806) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Signed-off-by: Marc-Antoine Perennou <[email protected]>
|
I guess this can be rolled up now |
|
⌛ Testing commit d14f07e with merge aaaefd7e01a15a8e9846e4d4bdad365d3460241c... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
@bors retry rollup- Failed on 32-bit macOS. Seems like a spurious error. Removed rollup marker, in order to unblock the beta backport. Creating a rollup including this PR is still welcome. |
bors
added
S-waiting-on-bors
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 11, 2018
When executing run-make tests we run a risk of leaking the `MAKEFLAGS` environment variable if `./x.py` itself was called from `make` (aka `make check -j3` as the OSX bots do). We may then leak accidentally fds into the child process and trick it into thinking it's got a jobserver! Hopefully addresses [this] spurious failure [this]: rust-lang#48295 (comment)
|
⌛ Testing commit d14f07e with merge ae22d0ebabc99183fbba992f1c50a4412002597a... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Mar 12, 2018
…ennytm test: Forcibly remove MAKEFLAGS in compiletest When executing run-make tests we run a risk of leaking the `MAKEFLAGS` environment variable if `./x.py` itself was called from `make` (aka `make check -j3` as the OSX bots do). We may then leak accidentally fds into the child process and trick it into thinking it's got a jobserver! Hopefully addresses [this] spurious failure [this]: rust-lang#48295 (comment)
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Mar 12, 2018
test: Forcibly remove MAKEFLAGS in compiletest When executing run-make tests we run a risk of leaking the `MAKEFLAGS` environment variable if `./x.py` itself was called from `make` (aka `make check -j3` as the OSX bots do). We may then leak accidentally fds into the child process and trick it into thinking it's got a jobserver! Hopefully addresses [this] spurious failure [this]: #48295 (comment)
bors
added a commit
that referenced
this pull request
Mar 12, 2018
rustbuild: pass datadir to rust-installer This fixes zsh completion install when $datadir != $prefix/share
|
☀️ Test successful - status-appveyor, status-travis |
kennytm
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Mar 13, 2018
[beta] rustbuild: pass datadir to rust-installer Backport from #48295
djrenren
pushed a commit
to djrenren/compiletest
that referenced
this pull request
Aug 26, 2019
When executing run-make tests we run a risk of leaking the `MAKEFLAGS` environment variable if `./x.py` itself was called from `make` (aka `make check -j3` as the OSX bots do). We may then leak accidentally fds into the child process and trick it into thinking it's got a jobserver! Hopefully addresses [this] spurious failure [this]: rust-lang/rust#48295 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes zsh completion install when $datadir != $prefix/share