Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add i586-unknown-linux-musl target #47282

Merged
merged 1 commit into from
Jan 12, 2018
Merged

Conversation

malbarbo
Copy link
Contributor

@malbarbo malbarbo commented Jan 8, 2018

No description provided.

@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@malbarbo
Copy link
Contributor Author

malbarbo commented Jan 8, 2018

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

Sure!

@bors
Copy link
Contributor

bors commented Jan 8, 2018

📌 Commit 5555e98 has been approved by alexcrichton

@carols10cents carols10cents added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 9, 2018
@kennytm
Copy link
Member

kennytm commented Jan 11, 2018

@bors r-

https://travis-ci.org/rust-lang/rust/jobs/327519101

Invalid image: dist-i586-gnu-i586-i686-musl

Please check if the Dockerfile is written correctly.

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 11, 2018
@malbarbo
Copy link
Contributor Author

Fixed a type in the docker image i568 -> i586

@kennytm
Copy link
Member

kennytm commented Jan 11, 2018

I think you have accidentally updated the "book" and "reference" submodules.

@malbarbo
Copy link
Contributor Author

Oh, sorry! Fixed now.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 11, 2018

📌 Commit 882cd3c has been approved by alexcrichton

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 11, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jan 12, 2018
bors added a commit that referenced this pull request Jan 12, 2018
@bors bors merged commit 882cd3c into rust-lang:master Jan 12, 2018
@@ -38,12 +42,13 @@ ENV RUST_CONFIGURE_ARGS \
# See: https://github.com/rust-lang/rust/issues/34978
ENV CFLAGS_i686_unknown_linux_musl=-Wa,-mrelax-relocations=no
ENV CFLAGS_i586_unknown_linux_gnu=-Wa,-mrelax-relocations=no
# FIXME remove -Wl,-melf_i386 after cc is updated to include
Copy link
Contributor

@kpp kpp Apr 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rust-lang/cc-rs#281 is merged. cc-rs released this PR in 1.0.5 release on 4 March

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants