holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cross-compiling with cross-rs (#9972)

Browse Source 
I cross-compiled Nushell (from x64 to ARM64) for the first time in a
while and noticed that our [`cross-rs`](https://github.com/cross-rs)
setup was no longer working. I've fixed that by following [the latest
`cross-rs`
docs](https://github.com/cross-rs/cross/wiki/Recipes#openssl).
This commit is contained in:
Reilly Wood 2023-08-09 22:08:35 -07:00 committed by GitHub
parent 6f5bd62a97
commit f94df58486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cross.toml
View File

@ -1,9 +1,18 @@
# Configuration for cross-rs: https://github.com/cross-rs/cross # Configuration for cross-rs: https://github.com/cross-rs/cross
# Run cross-rs like this: # Run cross-rs like this:
# cross build --target aarch64-unknown-linux-musl --release # cross build --target aarch64-unknown-linux-gnu --release
# or
# cross build --target aarch64-unknown-linux-musl --release --features=static-link-openssl
[target.aarch64-unknown-linux-gnu] [target.aarch64-unknown-linux-gnu]
dockerfile = "./docker/cross-rs/aarch64-unknown-linux-gnu.dockerfile" pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH clang"
]
# NOTE: for musl you will need to build with --features=static-link-openssl
[target.aarch64-unknown-linux-musl] [target.aarch64-unknown-linux-musl]
dockerfile = "./docker/cross-rs/aarch64-unknown-linux-musl.dockerfile" pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get install --assume-yes clang"
]

5
docker/cross-rs/aarch64-unknown-linux-gnu.dockerfile
View File

@ -1,5 +0,0 @@
FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:latest
RUN dpkg --add-architecture arm64 && \
apt-get update && \
apt-get install --assume-yes libssl-dev:arm64 clang

5
docker/cross-rs/aarch64-unknown-linux-musl.dockerfile
View File

@ -1,5 +0,0 @@
FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:latest
RUN dpkg --add-architecture arm64 && \
apt-get update && \
apt-get install --assume-yes libssl-dev:arm64 clang