Skip to content

Commit

Permalink
LLVM MSVC build: Fix configuration for LLVM>=17 when its source is fr…
Browse files Browse the repository at this point in the history
…eshly cloned

LLVM 18 doesn't allow this defect anymore, fixes 6f33b11
  • Loading branch information
pal1000 committed Mar 15, 2024
1 parent 7930d29 commit df22d2c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion buildscript/modules/libva.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@cd libva
@for /f tokens^=2^ delims^=/^ eol^= %%a in ('git symbolic-ref --short refs/remotes/origin/HEAD 2^>^&^1') do @git checkout %%a
@git pull --progress --tags --recurse-submodules origin
@git checkout 2.20.0
@git checkout 2.21.0
)
@IF %gitstate% GTR 0 echo.
@IF "%pkgconfigstate%"=="0" GOTO nolibva
Expand Down
1 change: 1 addition & 0 deletions buildscript/modules/llvm.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
@git checkout -f FETCH_HEAD
@git clean -df
@echo.
@set llvmsrcver=%updllvmsrcver:.=%
)

@rem Apply is_trivially_copyable patch
Expand Down
4 changes: 2 additions & 2 deletions buildscript/modules/mesonsubprojects.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ set "exitloop="
)
@if %gitstate% GTR 0 for /f delims^=^ eol^= %%a in ('dir /b /a^:d "%devroot%\mesa\subprojects\DirectX-Header*" 2^>^&1') do @IF EXIST "%devroot%\mesa\subprojects\%%~nxa\" (
@cd "%devroot%\mesa\subprojects\%%~nxa"
@rem echo Using DirectX-Headers stable release...
@echo Using DirectX-Headers stable release...
@for /f tokens^=2^ delims^=/^ eol^= %%a in ('git symbolic-ref --short refs/remotes/origin/HEAD 2^>^&^1') do @git checkout %%a
@git pull -f --progress --tags --recurse-submodules origin
@git checkout 7a9f4d06911d30eecb56a4956dab29dcca2709ed
@git checkout v1.613.0
@cd "%devroot%\mesa"
)
@if %gitstate% GTR 0 echo.
Expand Down
2 changes: 2 additions & 0 deletions releasenotes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
### Build script
- LLVM MSVC build: Fix configuration for LLVM>=17 when its source is freshly cloned, LLVM 18 doesn't allow this defect anymore, fixes 6f33b110.
### Distribution
- There is no need to patch Vulkan drivers JSON files to fix them since 24.1.0-devel, [Vulkan JSON generation has been fixed](https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27468).
# 24.0.2
Expand Down

0 comments on commit df22d2c

Please sign in to comment.