Skip to content

Commit

Permalink
Ignore -native suffix on Windows-ARM and fall back to JVM (#4589)
Browse files Browse the repository at this point in the history
Fixes #4414

We only need to do this on windows, since on Linux and Mac we support
both ARM and Intel
  • Loading branch information
lihaoyi authored Feb 19, 2025
1 parent a16a448 commit d8f12f0
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions mill.bat
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@ REM Check if MILL_VERSION contains MILL_NATIVE_SUFFIX
echo %MILL_VERSION% | findstr /C:"%MILL_NATIVE_SUFFIX%" >nul
if %errorlevel% equ 0 (
set "MILL_VERSION=%MILL_VERSION:-native=%"
set "ARTIFACT_SUFFIX=-native-windows-amd64"
set "MILL_EXT=.exe"
REM -native images compiled with graal do not support windows-arm
REM https://github.com/oracle/graal/issues/9215
IF /I NOT "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
set "ARTIFACT_SUFFIX=-native-windows-amd64"
set "MILL_EXT=.exe"
)
)

set MILL=%MILL_DOWNLOAD_PATH%\!FULL_MILL_VERSION!!MILL_EXT!
Expand Down

0 comments on commit d8f12f0

Please sign in to comment.