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

Prepare for ARM/FreeBSD/NetBSD nightlies #2510

Merged
merged 1 commit into from
Mar 23, 2016

Conversation

alexcrichton
Copy link
Member

This commit beefs up Cargo's makefiles to support nightly builds of Cargo for
multiple platforms. This primarily involves vendoring the logic of how to build
OpenSSL for statically linking against Cargo into the Makefiles directly. We'll
have to update the version of OpenSSL as releases are made, but we essentially
already do that with the normal docker container.

The Linux nightlies will still run in the normal dist docker container (a really
old CentOS build) and builds for new platforms will happen in the standard
linux-cross container we use for other cross builds. The nightly versions of
these will produce Cargo tarballs for a whole bunch of platforms to get
uploaded.

This has been tested in the alexcrichton/rust-slave-linux-cross:2016-03-17b
docker container for the 3 ARM targets and FreeBSD target. NetBSD will come once
rust-lang/rust#32407 lands.

@rust-highfive
Copy link

r? @huonw

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

@alexcrichton
Copy link
Member Author

Some of the makefile/script changes here as well were also done to support out-of-tree build directories (when I was playing around inside docker). The updates of crates were just done largely to add cfg(unix) dependencies (via the new syntax) on openssl-sys, and that's also why the Cargo snapshot has been updated (to a Cargo which understands this syntax).

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned huonw Mar 22, 2016
@alexcrichton alexcrichton force-pushed the xcompile branch 2 times, most recently from b11e724 to 005de35 Compare March 22, 2016 21:48
@alexcrichton
Copy link
Member Author

cc @japaric

@alexcrichton alexcrichton force-pushed the xcompile branch 2 times, most recently from f87379a to d363095 Compare March 22, 2016 22:04
@brson
Copy link
Contributor

brson commented Mar 22, 2016

@bors r+ fuck makefiles

@bors
Copy link
Collaborator

bors commented Mar 22, 2016

📌 Commit d363095 has been approved by brson

This commit beefs up Cargo's makefiles to support nightly builds of Cargo for
multiple platforms. This primarily involves vendoring the logic of how to build
OpenSSL for statically linking against Cargo into the Makefiles directly. We'll
have to update the version of OpenSSL as releases are made, but we essentially
already do that with the normal docker container.

The Linux nightlies will still run in the normal dist docker container (a really
old CentOS build) and builds for new platforms will happen in the standard
linux-cross container we use for other cross builds. The nightly versions of
these will produce Cargo tarballs for a whole bunch of platforms to get
uploaded.

This has been tested in the `alexcrichton/rust-slave-linux-cross:2016-03-17b`
docker container for the 3 ARM targets and FreeBSD target. NetBSD will come once
rust-lang/rust#32407 lands.
@alexcrichton
Copy link
Member Author

@bors: r=brson 83b4f39

@bors
Copy link
Collaborator

bors commented Mar 23, 2016

⌛ Testing commit 83b4f39 with merge e43adeb...

bors added a commit that referenced this pull request Mar 23, 2016
Prepare for ARM/FreeBSD/NetBSD nightlies

This commit beefs up Cargo's makefiles to support nightly builds of Cargo for
multiple platforms. This primarily involves vendoring the logic of how to build
OpenSSL for statically linking against Cargo into the Makefiles directly. We'll
have to update the version of OpenSSL as releases are made, but we essentially
already do that with the normal docker container.

The Linux nightlies will still run in the normal dist docker container (a really
old CentOS build) and builds for new platforms will happen in the standard
linux-cross container we use for other cross builds. The nightly versions of
these will produce Cargo tarballs for a whole bunch of platforms to get
uploaded.

This has been tested in the `alexcrichton/rust-slave-linux-cross:2016-03-17b`
docker container for the 3 ARM targets and FreeBSD target. NetBSD will come once
rust-lang/rust#32407 lands.
@bors
Copy link
Collaborator

bors commented Mar 23, 2016

@bors bors merged commit 83b4f39 into rust-lang:master Mar 23, 2016
@bors bors mentioned this pull request Mar 23, 2016
@alexcrichton alexcrichton deleted the xcompile branch March 23, 2016 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants