From 1e7813939c47944c28013544a68fa759f762cf38 Mon Sep 17 00:00:00 2001 From: pal1000 Date: Fri, 18 Oct 2024 08:18:20 -0700 Subject: [PATCH] LLVM build: Fix source update check for v19 and up Ref: llvm/llvm-project#84641 --- buildscript/modules/llvm.cmd | 5 +++-- releasenotes.md | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buildscript/modules/llvm.cmd b/buildscript/modules/llvm.cmd index a340f7c..89aa67e 100644 --- a/buildscript/modules/llvm.cmd +++ b/buildscript/modules/llvm.cmd @@ -12,10 +12,11 @@ @if /I NOT "%cfgllvmbuild%"=="y" GOTO skipllvm @rem Get/update LLVM source code -@set updllvmsrcver=19.1.1 +@set updllvmsrcver=19.1.2 @if /I "%legacyllvm%"=="y" set updllvmsrcver=18.1.8 @set llvmsrcver=0 -@set llvmsrcloc="%devroot%\llvm-project\llvm\CMakeLists.txt" +@set llvmsrcloc="%devroot%\llvm-project\cmake\Modules\LLVMVersion.cmake" +@if NOT EXIST %llvmsrcloc% set llvmsrcloc="%devroot%\llvm-project\llvm\CMakeLists.txt" @if NOT EXIST %llvmsrcloc% set llvmsrcloc="%devroot%\llvm\CMakeLists.txt" @if NOT EXIST %llvmsrcloc% set llvmsrcloc=null @if NOT %llvmsrcloc%==null for /f tokens^=2^ delims^=^(^)^ eol^= %%a IN ('type %llvmsrcloc%') DO @for /f tokens^=1^,2^ eol^= %%b IN ("%%a") DO @( diff --git a/releasenotes.md b/releasenotes.md index 472697b..d0e0e4c 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,3 +1,5 @@ +### Build script +- LLVM build: Fix source update check for [v19 and up](https://github.com/llvm/llvm-project/pull/84641). # 24.2.4 - Updated Mesa3D to [24.2.4](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.2/docs/relnotes/24.2.4.rst?ref_type=heads&plain=0). ### Build script