Skip to content

Commit

Permalink
rust-overlay: add i686-linux target
Browse files Browse the repository at this point in the history
For 32-bit x86 binary on Linux.
  • Loading branch information
syncom committed Apr 30, 2024
1 parent 6a847f4 commit 45b42b8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
8 changes: 7 additions & 1 deletion nix-rust-overlay/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ENV NIX_PATH=nixpkgs=/build/nixpkgs:rust-overlay=/build/rust-overlay
#########################################################
COPY nix-rust-overlay/shell-x86_64-win.nix /build/${RUST_PROJECT_NAME}/shell-x86_64-win.nix
COPY nix-rust-overlay/shell-x86_64.nix /build/${RUST_PROJECT_NAME}/shell-x86_64.nix
COPY nix-rust-overlay/shell-i686.nix /build/${RUST_PROJECT_NAME}/shell-i686.nix
COPY nix-rust-overlay/shell-aarch64.nix /build/${RUST_PROJECT_NAME}/shell-aarch64.nix
COPY nix-rust-overlay/shell-armv7.nix /build/${RUST_PROJECT_NAME}/shell-armv7.nix
COPY nix-rust-overlay/shell-armv6.nix /build/${RUST_PROJECT_NAME}/shell-armv6.nix
Expand All @@ -59,6 +60,8 @@ RUN cd /build/${RUST_PROJECT_NAME} && \
nix-shell shell-armv6.nix
RUN cd /build/${RUST_PROJECT_NAME} && \
nix-shell shell-armv7.nix
RUN cd /build/${RUST_PROJECT_NAME} && \
nix-shell shell-i686.nix

#########################################################
# Step 3: Cross builds for various targets
Expand Down Expand Up @@ -89,4 +92,7 @@ RUN cd /build/${RUST_PROJECT_NAME} && \
echo TARGET=arm-unknown-linux-musleabihf make run" && \
nix-shell shell-armv7.nix \
--run "TARGET=armv7-unknown-linux-musleabihf make && \
echo TARGET=armv7-unknown-linux-musleabihf make run"
echo TARGET=armv7-unknown-linux-musleabihf make run" && \
nix-shell shell-i686.nix \
--run "TARGET=i686-unknown-linux-musl make && \
echo TARGET=i686-unknown-linux-musl make run"
21 changes: 21 additions & 0 deletions nix-rust-overlay/shell-i686.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# h/t https://github.com/oxalica/rust-overlay/tree/master/examples/cross-aarch64
# When invoking with `nix-shell`, add "rust-overlay=/path/to/rust-overlay/dir"
# to $NIX_PATH
(import <nixpkgs> {
crossSystem = "i686-linux";
overlays = [ (import <rust-overlay>) ];
}).pkgsMusl.pkgsStatic.callPackage (
{ mkShell, stdenv, rust-bin, pkg-config, openssl, qemu }:
mkShell {
nativeBuildInputs = [
rust-bin.stable."1.76.0".minimal
pkg-config
];

depsBuildBuild = [ qemu ];

buildInputs = [ openssl ];

CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_LINKER = "${stdenv.cc.targetPrefix}cc";
CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_RUNNER = "qemu-i386";
}) {}

0 comments on commit 45b42b8

Please sign in to comment.