Merged
Conversation
Member
|
@bors: r+ |
Collaborator
|
📌 Commit c1c045d has been approved by |
Member
|
@TimNN out of curiosity, how come we don't run into this today? Or is this part of the LLVM 4.0 upgrade? |
Contributor
Author
|
@alexcrichton: I honestly don't really know. While I did encounter this working on the LLVM 4.0 upgrade, I also had a few successful builds without this being a problem. I think I encountered this after compiling llvm / rustc with some additional debugging options, although this may have also been caused by me running / adapting some failed commands. |
Member
|
Oh well, seems ok regardless :) |
Collaborator
|
🔒 Merge conflict |
TimNN
force-pushed
the
fix-emscripten-tests
branch
from
c1c045d to
4eeede3
Compare
Contributor
Author
|
Rebased. |
Member
|
@bors: r+ |
Collaborator
|
📌 Commit 4eeede3 has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 9, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 9, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 10, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 10, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 11, 2017
…richton Fix emscripten test detection Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness. r? @alexcrichton
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Without this change
rustbuildwill attempt to run.js.mapfiles (if they exist) resulting in lots of sadness.r? @alexcrichton