fix(ci): use aarch64-pc-windows-gnullvm for aarch64-mingw-ucrt

The stable Rust toolchain does not support aarch64-pc-windows-gnu. The correct Tier 2 target for MinGW-w64 on AArch64 is aarch64-pc-windows-gnullvm. This commit updates the toolchain configuration and derived files to use the correct target.

Author: ianks

data/derived/github-actions-matrix.json

@@ -22,7 +22,7 @@
     },
     {
       "ruby-platform": "aarch64-mingw-ucrt",
-      "rust-target": "aarch64-pc-windows-gnu"
+      "rust-target": "aarch64-pc-windows-gnullvm"
     },
     {
       "ruby-platform": "x64-mingw32",

data/derived/ruby-to-rust.json

@@ -4,7 +4,7 @@
   "aarch64-linux-musl": "aarch64-unknown-linux-musl",
   "arm64-darwin": "aarch64-apple-darwin",
   "x64-mingw-ucrt": "x86_64-pc-windows-gnu",
-  "aarch64-mingw-ucrt": "aarch64-pc-windows-gnu",
+  "aarch64-mingw-ucrt": "aarch64-pc-windows-gnullvm",
   "x64-mingw32": "x86_64-pc-windows-gnu",
   "x86-linux": "i686-unknown-linux-gnu",
   "x86-mingw32": "i686-pc-windows-gnu",

data/toolchains.json

@@ -57,7 +57,7 @@
     },
     {
       "ruby-platform": "aarch64-mingw-ucrt",
-      "rust-target": "aarch64-pc-windows-gnu",
+      "rust-target": "aarch64-pc-windows-gnullvm",
       "dockerfile": "docker/Dockerfile.aarch64-mingw-ucrt",
       "rake-compiler-dock": {
         "cc": "aarch64-w64-mingw32-clang"

docker/Dockerfile.aarch64-mingw-ucrt

@@ -2,20 +2,20 @@
 FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.10.0-mri-aarch64-mingw-ucrt
 
 ENV RUBY_TARGET="aarch64-mingw-ucrt" \
-    RUST_TARGET="aarch64-pc-windows-gnu" \
+    RUST_TARGET="aarch64-pc-windows-gnullvm" \
     RUSTUP_DEFAULT_TOOLCHAIN="stable" \
     PKG_CONFIG_ALLOW_CROSS="1" \
     RUSTUP_HOME="/usr/local/rustup" \
     CARGO_HOME="/usr/local/cargo" \
     PATH="/usr/local/cargo/bin:/llvm-mingw/bin:$PATH" \
     LIBCLANG_PATH="/llvm-mingw/lib" \
-    CC_aarch64_pc_windows_gnu="aarch64-w64-mingw32-clang" \
-    CXX_aarch64_pc_windows_gnu="aarch64-w64-mingw32-clang++" \
-    AR_aarch64_pc_windows_gnu="aarch64-w64-mingw32-ar" \
-    BINDGEN_EXTRA_CLANG_ARGS_aarch64_pc_windows_gnu="--target=aarch64-w64-mingw32 --sysroot=/llvm-mingw/aarch64-w64-mingw32" \
-    PKG_CONFIG_PATH_aarch64_pc_windows_gnu="/llvm-mingw/aarch64-w64-mingw32/lib/pkgconfig" \
-    CARGO_TARGET_AARCH64_PC_WINDOWS_GNU_LINKER="aarch64-w64-mingw32-clang" \
-    CMAKE_aarch64_pc_windows_gnu="/opt/cmake/bin/cmake"
+    CC_aarch64_pc_windows_gnullvm="aarch64-w64-mingw32-clang" \
+    CXX_aarch64_pc_windows_gnullvm="aarch64-w64-mingw32-clang++" \
+    AR_aarch64_pc_windows_gnullvm="aarch64-w64-mingw32-ar" \
+    BINDGEN_EXTRA_CLANG_ARGS_aarch64_pc_windows_gnullvm="--target=aarch64-w64-mingw32 --sysroot=/llvm-mingw/aarch64-w64-mingw32" \
+    PKG_CONFIG_PATH_aarch64_pc_windows_gnullvm="/llvm-mingw/aarch64-w64-mingw32/lib/pkgconfig" \
+    CARGO_TARGET_AARCH64_PC_WINDOWS_GNULLVM_LINKER="aarch64-w64-mingw32-clang" \
+    CMAKE_aarch64_pc_windows_gnullvm="/opt/cmake/bin/cmake"
 
 COPY setup/lib.sh setup/rustup.sh setup/rubygems.sh setup/cmake.sh setup/rubybashrc.sh setup/rb-sys-dock.sh setup/delete-unused-files.sh /
 

gem/lib/rb_sys/toolchain_info/data.rb

@@ -5,6 +5,6 @@
 module RbSys
   class ToolchainInfo
     # @private
-    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "aarch64-mingw-ucrt" => {"rust-target" => "aarch64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "aarch64-w64-mingw32-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
+    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "aarch64-mingw-ucrt" => {"rust-target" => "aarch64-pc-windows-gnullvm", "rake-compiler-dock" => {"cc" => "aarch64-w64-mingw32-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
   end
 end