Skip to content
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
merged 1 commit into from
Oct 4, 2016

Conversation

antrik
Copy link
Contributor

@antrik antrik commented Sep 29, 2016

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...


This change is Reviewable

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...
@antrik
Copy link
Contributor Author

antrik commented Sep 29, 2016

Internal compiler error in nightly on macos... I'm pretty sure I'm not to blame for this one :-)

@emilio
Copy link
Member

emilio commented Sep 30, 2016

r? @larsbergstrom

@larsbergstrom
Copy link
Contributor

@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!

@bors-servo
Copy link

📌 Commit 64cfcfd has been approved by larsbergstrom

@bors-servo
Copy link

⌛ Testing commit 64cfcfd with merge 8e584a3...

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 -->
@bors-servo
Copy link

💔 Test failed - status-travis

@larsbergstrom
Copy link
Contributor

@bors-servo retry

  • was a rustup.sh issue

@bors-servo
Copy link

⌛ Testing commit 64cfcfd with merge a3338d6...

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 -->
@bors-servo
Copy link

💔 Test failed - status-travis

@emilio
Copy link
Member

emilio commented Oct 3, 2016

@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 -->
@bors-servo
Copy link

⌛ Testing commit 64cfcfd with merge fe11dda...

@bors-servo
Copy link

💔 Test failed - status-travis

@antrik
Copy link
Contributor Author

antrik commented Oct 3, 2016

This ICE seems reproducible. Anyone knows what's up with this? Does it really only affect this PR?...

@larsbergstrom
Copy link
Contributor

@antrik Appears to be rust-lang/rust#36816

@antrik
Copy link
Contributor Author

antrik commented Oct 4, 2016

Newer nightlies are available at last. Another retry please?

@emilio
Copy link
Member

emilio commented Oct 4, 2016

Sure.

@bors-servo: retry

@bors-servo
Copy link

⌛ Testing commit 64cfcfd with merge 0a5935b...

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 -->
@bors-servo
Copy link

☀️ Test successful - status-travis

@bors-servo bors-servo merged commit 64cfcfd into servo:master Oct 4, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants