From 8eb7d2d36514bb7f719193434970fcff8259dd59 Mon Sep 17 00:00:00 2001 From: pal1000 Date: Thu, 5 Dec 2024 12:10:00 -0800 Subject: [PATCH] Workaround #156 by disabling LLVM support for GCC static build --- buildscript/modules/mesa3d.cmd | 4 ++++ releasenotes.md | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/buildscript/modules/mesa3d.cmd b/buildscript/modules/mesa3d.cmd index e4d7a69..3a70194 100644 --- 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 index 4d4c479..fa63e40 100644 --- 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