Support windows-arm64 (#196)

sass-contrib · Mar 19, 2024 · b04e5a3 · b04e5a3
1 parent d861463
commit b04e5a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -85,6 +85,8 @@ jobs:
             platform: x86-linux-musl
           - os: ubuntu-latest
             platform: x86_64-linux-musl
+          - os: windows-latest
+            platform: aarch64-mingw-ucrt
           - os: windows-latest
             platform: x64-mingw-ucrt
           - os: windows-latest

diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile
@@ -247,7 +247,7 @@ module SassConfig
           when /amd64|x86_64|x64/
             'x86_64'
           when /i\d86|x86|i86pc/
-            'i386'
+            'x86'
           when /arm64|aarch64/
             'aarch64'
           when /arm/
@@ -259,8 +259,6 @@ module SassConfig
           end
 
     ARCH = "#{CPU}-#{OS}".freeze
-
-    EMULATION = ('x86_64' if ARCH == 'aarch64-windows')
   end
 
   private_constant :Platform
@@ -300,8 +298,8 @@ module SassConfig
            raise NotImplementedError, message
          end
 
-    cpu = case Platform::EMULATION || Platform::CPU
-          when 'i386'
+    cpu = case Platform::CPU
+          when 'x86'
             'ia32'
           when 'x86_64'
             'x64'
@@ -342,8 +340,8 @@ module SassConfig
            raise NotImplementedError, message
          end
 
-    cpu = case Platform::EMULATION || Platform::CPU
-          when 'i386'
+    cpu = case Platform::CPU
+          when 'x86'
             'x86_32'
           when 'x86_64'
             'x86_64'
@@ -407,7 +405,7 @@ module SassConfig
   end
 
   def gem_platform
-    platform = Gem::Platform.new("#{Platform::EMULATION || Platform::CPU}-#{RbConfig::CONFIG['host_os']}")
+    platform = Gem::Platform.new("#{Platform::CPU}-#{RbConfig::CONFIG['host_os']}")
     case Platform::OS
     when 'darwin'
       Gem::Platform.new([RbConfig::CONFIG['host_cpu'], platform.os])
@@ -419,10 +417,12 @@ module SassConfig
       end
     when 'windows'
       case platform.cpu
+      when 'x86'
+        Gem::Platform.new('x86-mingw32')
       when 'x86_64'
-        Gem::Platform.new('x64-mingw32')
+        Gem::Platform.new('x64-mingw-ucrt')
       else
-        Gem::Platform.new([platform.cpu, 'mingw32'])
+        Gem::Platform.new([platform.cpu, 'mingw', 'ucrt'])
       end
     else
       platform