From 7b037556cd53d9fed57e5048a289009a13bdbd17 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 30 Jan 2025 11:06:16 -0800
Subject: [PATCH] Make it possible to override RUBY_TARGET (#512)

* Revert "Append -gnu to RUBY_TARGET for GNU Linux builds (#511)"

This reverts commit 798fad126160729ddf4ab5365c08bd03b853ef4a.

* Make it possible to override RUBY_TARGET

Previously if you attempt to run `rb-sys-dock --platform x86_64-linux-gnu`
the `RUBY_TARGET` was hard-coded to `x86_64-linux`. Now this can
be overriden by the `rb-sys-dock` so that the `--platform` argument
can work with `x86_64-linux` or `x86_64-linux-gnu`.
---
 docker/Dockerfile.aarch64-linux | 2 +-
 docker/Dockerfile.arm-linux     | 2 +-
 docker/Dockerfile.x86-linux     | 2 +-
 docker/Dockerfile.x86_64-linux  | 2 +-
 docker/setup/rubybashrc.sh      | 1 -
 gem/exe/rb-sys-dock             | 1 +
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile.aarch64-linux b/docker/Dockerfile.aarch64-linux
index a53179ff..71951e0d 100644
--- a/docker/Dockerfile.aarch64-linux
+++ b/docker/Dockerfile.aarch64-linux
@@ -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-gnu" \
+ENV RUBY_TARGET="aarch64-linux" \
     RUST_TARGET="aarch64-unknown-linux-gnu" \
     RUSTUP_DEFAULT_TOOLCHAIN="stable" \
     PKG_CONFIG_ALLOW_CROSS="1" \
diff --git a/docker/Dockerfile.arm-linux b/docker/Dockerfile.arm-linux
index 270a1c74..75f64325 100644
--- a/docker/Dockerfile.arm-linux
+++ b/docker/Dockerfile.arm-linux
@@ -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-gnu" \
+ENV RUBY_TARGET="arm-linux" \
     RUST_TARGET="arm-unknown-linux-gnueabihf" \
     RUSTUP_DEFAULT_TOOLCHAIN="stable" \
     PKG_CONFIG_ALLOW_CROSS="1" \
diff --git a/docker/Dockerfile.x86-linux b/docker/Dockerfile.x86-linux
index 3e8f65f5..03bfdc32 100644
--- a/docker/Dockerfile.x86-linux
+++ b/docker/Dockerfile.x86-linux
@@ -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-gnu" \
+ENV RUBY_TARGET="x86-linux" \
     RUST_TARGET="i686-unknown-linux-gnu" \
     RUSTUP_DEFAULT_TOOLCHAIN="stable" \
     PKG_CONFIG_ALLOW_CROSS="1" \
diff --git a/docker/Dockerfile.x86_64-linux b/docker/Dockerfile.x86_64-linux
index 7529943e..1037bf4d 100644
--- a/docker/Dockerfile.x86_64-linux
+++ b/docker/Dockerfile.x86_64-linux
@@ -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-gnu" \
+ENV RUBY_TARGET="x86_64-linux" \
     RUST_TARGET="x86_64-unknown-linux-gnu" \
     RUSTUP_DEFAULT_TOOLCHAIN="stable" \
     PKG_CONFIG_ALLOW_CROSS="1" \
diff --git a/docker/setup/rubybashrc.sh b/docker/setup/rubybashrc.sh
index dfe1a285..38a01c01 100755
--- a/docker/setup/rubybashrc.sh
+++ b/docker/setup/rubybashrc.sh
@@ -52,7 +52,6 @@ main() {
   echo "export PATH=\"/usr/local/cargo/bin:\$PATH\"" >> "$OUTFILE"
   echo "export RUSTUP_HOME=\"$RUSTUP_HOME\"" >> "$OUTFILE"
   echo "export CARGO_HOME=\"$CARGO_HOME\"" >> "$OUTFILE"
-  echo "export RUBY_TARGET=\"$RUBY_TARGET\"" >> "$OUTFILE"
   echo "export RCD_PLATFORM=\"$RUBY_TARGET\"" >> "$OUTFILE"
   echo "export RUST_TARGET=\"$RUST_TARGET\"" >> "$OUTFILE"
   echo "export RUSTUP_DEFAULT_TOOLCHAIN=\"$RUSTUP_DEFAULT_TOOLCHAIN\"" >> "$OUTFILE"
diff --git a/gem/exe/rb-sys-dock b/gem/exe/rb-sys-dock
index c5a8168b..6edd701f 100755
--- a/gem/exe/rb-sys-dock
+++ b/gem/exe/rb-sys-dock
@@ -391,6 +391,7 @@ def rcd(input_args)
       -e RB_SYS_DOCK_TMPDIR="/tmp/rb-sys-dock" \
       -e RB_SYS_CARGO_TARGET_DIR=#{tmp_target_dir.inspect} \
       -e RUBY_CC_VERSION="#{ruby_versions}" \
+      -e RUBY_TARGET="#{OPTIONS.fetch(:platform)}" \
       -e RAKEOPT \
       -e TERM \
       -w #{working_directory} \