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

Rust 1.40 #17684

Merged
merged 4 commits into from
Dec 29, 2019
Merged

Rust 1.40 #17684

merged 4 commits into from
Dec 29, 2019

Conversation

q66
Copy link
Contributor

@q66 q66 commented Dec 21, 2019

Testing:

  • x86_64
  • x86_64-musl
  • ppc*
  • aarch64(-musl)
  • armv7l(-musl)
  • Firefox builds

Depends on #17671

@q66 q66 force-pushed the rust140 branch 2 times, most recently from c0e05f8 to 8e48ec0 Compare December 21, 2019 18:32
@q66 q66 requested a review from jnbr December 21, 2019 22:52
@q66 q66 changed the title [WIP] Rust 1.40 Rust 1.40 Dec 21, 2019
@q66
Copy link
Contributor Author

q66 commented Dec 22, 2019

Gonna need these files mirrored from https://repo.voidlinux-ppc.org/distfiles/ to our distfiles location:

e930b7da1f3ae1e0d3568c06cd4cc5f68a61813a8c53adf0e97d9592f3e3425e  cargo-0.40.0-powerpc64le-unknown-linux-musl.tar.xz
d516be75b7cde33aa69db1e4fd99b222b868df3f642dada3bfed34d1db585380  cargo-0.40.0-powerpc64-unknown-linux-gnu.tar.xz
af226341d50cebc5af608375b6b200a1c10e14139812dc77a928140fe5120be9  cargo-0.40.0-powerpc64-unknown-linux-musl.tar.xz
a2a64bba73102caadf819dd268f5710c978ece0efa05aaa89cbae45a5443e880  cargo-0.40.0-powerpc-unknown-linux-gnu.tar.xz
bbbf7037590fd38c5d4b2e2ac7ddddcc13213d05885d7c1fc2eacbffa4d920f5  cargo-0.40.0-powerpc-unknown-linux-musl.tar.xz
aeb989553eb6b1e8a7473369d491c1ac4ff27a553743f19a042d759b1cbfbad9  rustc-1.39.0-powerpc64le-unknown-linux-musl.tar.xz
fa5fe636f502cd5a6af97281656dba59295d76e91158c19b59d6a970987fce8f  rustc-1.39.0-powerpc64-unknown-linux-gnu.tar.xz
f1fd45b8570bff03e22c70dcfc8cfa6e7657ab41ce082687f4bd294e08dad152  rustc-1.39.0-powerpc64-unknown-linux-musl.tar.xz
ed91f1e60b56e6bd09b003fda0aef5b99e014663033f3b2ede44a51e5b574b13  rustc-1.39.0-powerpc-unknown-linux-gnu.tar.xz
3a83a55b11774af98f199ca47bf7429338a2f1e1df5fdbffbdee6bc5ffcae5c9  rustc-1.39.0-powerpc-unknown-linux-musl.tar.xz
d7bf5bab6cd80d387fa1b9d41dd5a5825fc5de520048cc89a8d621760c44e6df  rust-std-1.39.0-powerpc64le-unknown-linux-musl.tar.xz
74f5deadb1052abf5475b3d7b204101a52337a89867daf3efde2adcd8dee78b2  rust-std-1.39.0-powerpc64-unknown-linux-gnu.tar.xz
c3455841abfb9e59ae0709fe5f0fa171212e8628bf464214734eafb46f97c4c2  rust-std-1.39.0-powerpc64-unknown-linux-musl.tar.xz
2cb595dd95d5f557b3d36006ce6fe283f324e721ad8f92e1f7772cc261787cae  rust-std-1.39.0-powerpc-unknown-linux-gnu.tar.xz
4b16d538a5a3ff8d85bd0a2bb28896ab170a340f40e40e06a8f59028285d57f6  rust-std-1.39.0-powerpc-unknown-linux-musl.tar.xz

@Gottox @Duncaen @the-maldridge

@Duncaen
Copy link
Member

Duncaen commented Dec 22, 2019

Done

@jnbr
Copy link
Contributor

jnbr commented Dec 23, 2019

Please don't merge yet. There are issues when cross building for armv7-musl.

@q66
Copy link
Contributor Author

q66 commented Dec 23, 2019

Really? I cross-compiled for armv7l-musl just fine

@pullmoll
Copy link
Member

FWIW I could just now cross build rust for armv7l-musl using rust for x86_64 without issues. Trying with rust for x86_64-musl now.

@q66
Copy link
Contributor Author

q66 commented Dec 28, 2019

We figured it out yesterday, there is a regression in cargo that results in libraries from cross sysroot leaking into host, particularly libgcc_s; that results in certain configs breaking, e.g. aarch64-musl on x86_64-musl, with errors from host dynamic linker such as "unsupported relocation " where N is some aarch64 reloc number... We will probably revert the rev in cargo locally

Rust builds fine as does the new cargo but trying to cross compile using this new cargo will result in the compiler failing to execute

@q66
Copy link
Contributor Author

q66 commented Dec 28, 2019

added @jnbr's cargo patch to fix crossbuilds

@jnbr can you re-test this?

@jnbr
Copy link
Contributor

jnbr commented Dec 28, 2019

Yes, musl builds are fine now, already tested this. Currently running glibc builds to make sure it doesn't break anything else.

Copy link
Contributor

@jnbr jnbr left a comment

Choose a reason for hiding this comment

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

lgtm

@q66 q66 merged commit f0d3884 into void-linux:master Dec 29, 2019
@q66 q66 deleted the rust140 branch April 20, 2020 14:27
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 17, 2021
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.

None yet

4 participants