This repository was archived by the owner on Jun 8, 2020. It is now read-only.
CMakeLists: check for i686 rather than i386
#121
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
This fixes build on my 32 bit x86 (Debian testing) system, which got broken in the transition to CMake. I'm not sure whether this shouldn't actually read `i386|i486|i586|i686`, to cover all possibilities -- but it was just `i686` in the old (non-CMake) `Makefile.cargo`; so unless CMake somehow munges this, I'm assuming just `i686` is still fine...
|
Internal compiler error in nightly on macos... I'm pretty sure I'm not to blame for this one :-) |
|
@bors-servo r+ That's fine. At some point, we should expand our target triple support, but I'd prefer to do so deliberately across all of our dependencies rather than making you add a bunch more piecemeal in this one PR. Thanks for the fix! |
|
📌 Commit 64cfcfd has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Sep 30, 2016
CMakeLists: check for `i686` rather than `i386` This fixes build on my 32 bit x86 (Debian testing) system, which got broken in the transition to CMake. I'm not sure whether this shouldn't actually read `i386|i486|i586|i686`, to cover all possibilities -- but it was just `i686` in the old (non-CMake) `Makefile.cargo`; so unless CMake somehow munges this, I'm assuming just `i686` is still fine... <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/121) <!-- Reviewable:end -->
|
💔 Test failed - status-travis |
|
@bors-servo retry
|
bors-servo
pushed a commit
that referenced
this pull request
Sep 30, 2016
CMakeLists: check for `i686` rather than `i386` This fixes build on my 32 bit x86 (Debian testing) system, which got broken in the transition to CMake. I'm not sure whether this shouldn't actually read `i386|i486|i586|i686`, to cover all possibilities -- but it was just `i686` in the old (non-CMake) `Makefile.cargo`; so unless CMake somehow munges this, I'm assuming just `i686` is still fine... <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/121) <!-- Reviewable:end -->
|
💔 Test failed - status-travis |
|
@bors-servo: retry |
bors-servo
pushed a commit
that referenced
this pull request
Oct 3, 2016
CMakeLists: check for `i686` rather than `i386` This fixes build on my 32 bit x86 (Debian testing) system, which got broken in the transition to CMake. I'm not sure whether this shouldn't actually read `i386|i486|i586|i686`, to cover all possibilities -- but it was just `i686` in the old (non-CMake) `Makefile.cargo`; so unless CMake somehow munges this, I'm assuming just `i686` is still fine... <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/121) <!-- Reviewable:end -->
|
💔 Test failed - status-travis |
|
This ICE seems reproducible. Anyone knows what's up with this? Does it really only affect this PR?... |
|
@antrik Appears to be rust-lang/rust#36816 |
|
Newer nightlies are available at last. Another retry please? |
|
Sure. @bors-servo: retry |
bors-servo
pushed a commit
that referenced
this pull request
Oct 4, 2016
CMakeLists: check for `i686` rather than `i386` This fixes build on my 32 bit x86 (Debian testing) system, which got broken in the transition to CMake. I'm not sure whether this shouldn't actually read `i386|i486|i586|i686`, to cover all possibilities -- but it was just `i686` in the old (non-CMake) `Makefile.cargo`; so unless CMake somehow munges this, I'm assuming just `i686` is still fine... <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/121) <!-- Reviewable:end -->
|
☀️ Test successful - status-travis |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 build on my 32 bit x86 (Debian testing) system, which got
broken in the transition to CMake.
I'm not sure whether this shouldn't actually read
i386|i486|i586|i686,to cover all possibilities -- but it was just
i686in the old(non-CMake)
Makefile.cargo; so unless CMake somehow munges this, I'massuming just
i686is still fine...This change is