Workaround #156 by disabling LLVM support for GCC static build

pal1000 · Dec 5, 2024 · 8eb7d2d · 8eb7d2d
1 parent 342936a
commit 8eb7d2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/buildscript/modules/mesa3d.cmd b/buildscript/modules/mesa3d.cmd
@@ -244,6 +244,10 @@
 @IF %toolchain%==msvc IF NOT EXIST "%llvminstloc%\%abi%\lib\" set havellvm=0
 @IF %toolchain%==msvc IF NOT EXIST "%llvminstloc%\%abi%\bin\llvm-config.exe" IF %cmakestate% EQU 0 set havellvm=0
 @IF %toolchain%==msvc IF NOT EXIST "%llvminstloc%\%abi%\bin\llvm-config.exe" IF %cmakestate% GTR 0 set llvmmethod=cmake
+
+@rem Workaround https://github.com/pal1000/mesa-dist-win/issues/156 - disable LLVM for GCC static build
+@IF %toolchain%==gcc IF /I NOT "%linkmingwdynamic%"=="y" set havellvm=0
+
 @set llvmless=n
 @if %havellvm%==0 set llvmless=y
 @if %havellvm%==1 call "%devroot%\%projectname%\bin\modules\prompt.cmd" llvmless "Build Mesa without LLVM (y/n). llvmpipe, swr, RADV, lavapipe and all OpenCL drivers won't be available and high performance JIT won't be available for softpipe, osmesa and graw:"

diff --git a/releasenotes.md b/releasenotes.md
@@ -1,6 +1,7 @@
 ### Build script
 - MSYS2 toolchain setup: Allow partial package installation failure;
-- MSYS2: Check OpenCL stack dependencies availability.
+- MSYS2: Check OpenCL stack dependencies availability;
+- Workaround [#156](https://github.com/pal1000/mesa-dist-win/issues/156) by disabling LLVM support for GCC static build.
 # 24.3.0
 - Updated Mesa3D to [24.3.0](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.3/docs/relnotes/24.3.0.rst?ref_type=heads&plain=0).
 ### Sponsorship