Skip to content

Commit

Permalink
Append -gnu to RUBY_TARGET for GNU Linux builds
Browse files Browse the repository at this point in the history
rake-compiler-dock images now make a distinction between GNU and
musl builds. Add a `-gnu` extension to `RUBY_TARGET` to make
it possible to run:

```
rb-sys-dock --platform x86_64-linux-gnu --directory . --build
```

Closes #510
  • Loading branch information
stanhu committed Jan 30, 2025
1 parent c167547 commit 601e9cd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-linux
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ensure this version matches the rack-compiler-version in Gemfile
FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-aarch64-linux

ENV RUBY_TARGET="aarch64-linux" \
ENV RUBY_TARGET="aarch64-linux-gnu" \
RUST_TARGET="aarch64-unknown-linux-gnu" \
RUSTUP_DEFAULT_TOOLCHAIN="stable" \
PKG_CONFIG_ALLOW_CROSS="1" \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-linux
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ensure this version matches the rack-compiler-version in Gemfile
FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-arm-linux

ENV RUBY_TARGET="arm-linux" \
ENV RUBY_TARGET="arm-linux-gnu" \
RUST_TARGET="arm-unknown-linux-gnueabihf" \
RUSTUP_DEFAULT_TOOLCHAIN="stable" \
PKG_CONFIG_ALLOW_CROSS="1" \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86-linux
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ensure this version matches the rack-compiler-version in Gemfile
FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86-linux

ENV RUBY_TARGET="x86-linux" \
ENV RUBY_TARGET="x86-linux-gnu" \
RUST_TARGET="i686-unknown-linux-gnu" \
RUSTUP_DEFAULT_TOOLCHAIN="stable" \
PKG_CONFIG_ALLOW_CROSS="1" \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-linux
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ensure this version matches the rack-compiler-version in Gemfile
FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86_64-linux

ENV RUBY_TARGET="x86_64-linux" \
ENV RUBY_TARGET="x86_64-linux-gnu" \
RUST_TARGET="x86_64-unknown-linux-gnu" \
RUSTUP_DEFAULT_TOOLCHAIN="stable" \
PKG_CONFIG_ALLOW_CROSS="1" \
Expand Down

0 comments on commit 601e9cd

Please sign in to comment.