Skip to content

Commit

Permalink
LLVM: Build install target again now that configuration has been opti…
Browse files Browse the repository at this point in the history
…mized
  • Loading branch information
pal1000 committed Mar 25, 2021
1 parent af3a4b9 commit c333aff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions buildscript/modules/llvm.cmd
Expand Up @@ -74,7 +74,7 @@
@set buildconf=%buildconf% -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_CRT_RELEASE=MT -DLLVM_ENABLE_RTTI=1 -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_OPTIMIZED_TABLEGEN=TRUE -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INCLUDE_RUNTIMES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_GO_TESTS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_BUILD_LLVM_C_DYLIB=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DCMAKE_INSTALL_PREFIX=../../llvm/%abi%
@if EXIST %devroot%\llvm-project set /p buildclang=Build clang - required for OpenCL (y/n):
@if EXIST %devroot%\llvm-project echo.
@if EXIST %devroot%\llvm-project IF /I NOT "%buildclang%"=="y" set buildconf=%buildconf% -DLLVM_ENABLE_PROJECTS=""
@if EXIST %devroot%\llvm-project IF /I NOT "%buildclang%"=="y" set buildconf=%buildconf% -DLLVM_ENABLE_PROJECTS="" -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_TOOLS=OFF
@IF /I "%buildclang%"=="y" set buildconf=%buildconf% -DLLVM_ENABLE_PROJECTS="clang;lld"
@set buildconf=%buildconf% ..
@if EXIST %devroot%\llvm-project set buildconf=%buildconf%/llvm
Expand All @@ -93,7 +93,7 @@
@pause
@echo.
@if /I NOT "%ninja%"=="y" cmake --build . -j %throttle% --config Release --target install
@if /I "%ninja%"=="y" ninja -j %throttle% install-llvm-libraries install-llvm-headers install-cmake-exports tools/install utils/TableGen/install
@if /I "%ninja%"=="y" ninja -j %throttle% install

:skipllvm
@echo.
Expand Down
3 changes: 2 additions & 1 deletion releasenotes.md
@@ -1,6 +1,7 @@
# Next release
### Build script
- MSVC build: Switch LLVM discovery method from config tool to cmake.
- MSVC build: Switch LLVM discovery method from config tool to cmake;
- LLVM: Build install target again now that configuration has been optimized.
### Deployment
- Add version info for Microsoft SPIR-V to DXIL library.
# 21.0.0
Expand Down

0 comments on commit c333aff

Please sign in to comment.