Switch to upstream servo/osmesa-src. #3308
Merged
Conversation
This file contains 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
|
@bors-servo r+ |
|
📌 Commit e0afb44 has been approved by |
|
r? @jrmuizel |
|
This has the same Permission denied problem |
|
Could it be something like the +x file permission bit is somehow not set on that script? |
|
It'd be really weird that that only happens when building in parallel mode. Looks like OSX make doesn't really respect MAKEFLAGS, but I'll find a different solution. @bors-servo r- |
emilio
added a commit
to emilio/osmesa-src
that referenced
this pull request
Nov 13, 2018
This is what mozjs does, and allows me to fix up servo/webrender#3308.
bors-servo
pushed a commit
to servo/osmesa-src
that referenced
this pull request
Nov 13, 2018
Allow specifying make via an environment variable. This is what mozjs does, and allows me to fix up servo/webrender#3308.
|
Let's see how that goes. |
Make the mac hack for servo#2638 specific for CI, via `CARGO_MAKEFLAGS`.
emilio
force-pushed
the
osmesa-src-upstream
branch
from
bc20b91
to
d477ecc
Compare
|
https://tools.taskcluster.net/groups/RlTzFrmjSfyDJykTgmkftw is green on OSX. |
|
@bors-servo r+ |
|
📌 Commit d477ecc has been approved by |
jrmuizel
reviewed
Nov 14, 2018
| @@ -156,6 +156,9 @@ tasks: | |||
| export RUSTFLAGS='--deny warnings' | |||
| export PKG_CONFIG_PATH="/usr/local/opt/zlib/lib/pkgconfig:$PKG_CONFIG_PATH" | |||
| export RUSTC_WRAPPER=sccache | |||
| echo 'exec make -j1 "$@"' > $HOME/make # See #2638 | |||
| chmod +x $HOME/make | |||
bors-servo
pushed a commit
that referenced
this pull request
Nov 14, 2018
Switch to upstream servo/osmesa-src. Make the mac hack for #2638 specific for CI, via `CARGO_MAKEFLAGS`. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/3308) <!-- Reviewable:end -->
|
☀️ Test successful - status-appveyor, status-taskcluster |
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.
Make the mac hack for #2638 specific for CI, via
CARGO_MAKEFLAGS.This change is