diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ccee1a25fbc0..001dc82413d3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -72,14 +72,21 @@ jobs:
 
   steps:
   - script: |
+      choco install ninja
+    displayName: Install Ninja
+
+  - script: |
+      call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\vsdevcmd" -arch=x64
       mkdir llvm_build
       cd llvm_build
-      cmake -G "Visual Studio 16 2019" .. -Thost=x64 -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_BUILD_TYPE=Release -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_USE_INTEL_JITEVENTS=ON -DLLVM_ENABLE_Z3_SOLVER=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=10.0 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT
+      cmake -G "Ninja" .. -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_USE_INTEL_JITEVENTS=ON -DLLVM_ENABLE_Z3_SOLVER=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=10.0 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT
     displayName: Configure LLVM
 
   - script: |
+      call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\vsdevcmd" -arch=x64
       cd llvm_build
-      cmake --build . --config Release -- /maxcpucount
+      cmake --build . --config Release
+      cmake --install . --config Release
     displayName: Build LLVM
 
   - script: |
@@ -104,8 +111,6 @@ jobs:
       mkdir cmake
       cd ..\
       xcopy "..\..\..\llvm_build\Release" ".\Release" /E
-      xcopy  "..\..\..\llvm_build\include" ".\include" /E
-      xcopy  "..\..\..\llvm_build\lib\cmake" ".\lib\cmake" /E
       cd ..\
       7z a -t7z -m0=lzma2 -mx=9 -aoa -r "llvmlibs_mt.7z" *
     displayName: Package LLVM Libraries