rustbuild: Don't pass -j if called by make
#44607
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) |
src/bootstrap/builder.rs
Outdated
| .arg("--target").arg(target); | ||
|
|
||
| // If we were invoked from `make` then that's already got a jobserver | ||
| // set up for us so no need to tell Cargo about jobs all over again. | ||
| if env::var("MAKEFLAGS").is_err() && env::var("MFLAGS").is_err() { |
There was a problem hiding this comment.
var_os if we're checking for presence. Also saves us the UTF8 conversion.
shepmaster
added
the
S-waiting-on-author
alexcrichton
force-pushed
the
rustbuild-no-j
branch
from
54d5a21 to
f392997
Compare
|
@bors: r=Mark-Simulacrum |
|
📌 Commit f392997 has been approved by |
|
@bors r- |
alexcrichton
force-pushed
the
rustbuild-no-j
branch
from
f392997 to
b2aab9c
Compare
|
@bors: r=Mark-Simulacrum |
|
📌 Commit b2aab9c has been approved by |
In these situations Cargo just prints out a warning about ignoring the flag anyway, so let `make` take care of jobs and whatnot instead of getting warnings printed.
alexcrichton
force-pushed
the
rustbuild-no-j
branch
from
b2aab9c to
4857bb7
Compare
|
@bors: r=Mark-Simulacrum |
|
📌 Commit 4857bb7 has been approved by |
bors
added a commit
that referenced
this pull request
Sep 17, 2017
rustbuild: Don't pass `-j` if called by `make` In these situations Cargo just prints out a warning about ignoring the flag anyway, so let `make` take care of jobs and whatnot instead of getting warnings printed.
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In these situations Cargo just prints out a warning about ignoring the flag
anyway, so let
maketake care of jobs and whatnot instead of getting warningsprinted.