LLVM: Restore config tool build for x64 when using VS backend

Fixes e155b4c
pal1000 · May 2, 2021 · e258764 · e258764
1 parent 97f2103
commit e258764
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/buildscript/modules/llvm.cmd b/buildscript/modules/llvm.cmd
@@ -29,7 +29,7 @@
 @rem Getting LLVM monorepo if LLVM source is missing
 @if NOT EXIST %devroot%\llvm\cmake if NOT EXIST %devroot%\llvm-project (
 @echo Getting LLVM source code...
-@git clone https://github.com/llvm/llvm-project.git --branch=llvmorg-11.1.0 --depth=1 %devroot%\llvm-project
+@git clone https://github.com/llvm/llvm-project.git --branch=llvmorg-12.0.0 --depth=1 %devroot%\llvm-project
 @echo.
 )
 
@@ -98,6 +98,8 @@
 @pause
 @echo.
 @if /I NOT "%ninja%"=="y" cmake --build . -j %throttle% --config Release --target install
+@if /I NOT "%ninja%"=="y" IF /I NOT "%buildclang%"=="y" IF %abi%==x64 cmake --build . -j %throttle% --config Release --target llvm-config
+@if /I NOT "%ninja%"=="y" IF /I NOT "%buildclang%"=="y" IF %abi%==x64 copy .\Release\bin\llvm-config.exe ..\..\llvm\%abi%\bin\
 @if /I "%ninja%"=="y" ninja -j %throttle% install
 @if /I "%ninja%"=="y" IF /I NOT "%buildclang%"=="y" IF %abi%==x64 ninja -j %throttle% llvm-config
 @if /I "%ninja%"=="y" IF /I NOT "%buildclang%"=="y" IF %abi%==x64 copy .\bin\llvm-config.exe ..\..\llvm\%abi%\bin\

diff --git a/releasenotes.md b/releasenotes.md
@@ -1,7 +1,8 @@
 # Next release
 ### Build sript
 - LLVM: Show build configuration command before wiping existing build;
-- LLVM: Build clang tools with clang and lld - fixes eb27094.
+- LLVM: Build clang tools with clang and lld - fixes eb27094;
+- LLVM: Restore config tool build for x64 when using VS backend - fixes e155b4c.
 # 21.0.3
 - Updated Mesa3D to [21.0.3](https://docs.mesa3d.org/relnotes/21.0.3.html).
 ### End-user documentation