-
Notifications
You must be signed in to change notification settings - Fork 60
CMakeLists: check for i686
rather than i386
#121
Conversation
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 |
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
|
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 |
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 |
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 |
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'massuming just
i686
is still fine...This change is