Update Windows version and use Ninja

Author: xdoardo

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
             os: 'macos-latest'
             tar_extra_args: ''
           - id: 'windows-amd64'
-            os: 'windows-2019'
+            os: 'windows-2022'
             # When unpacking an archive on Windows, the symlinks can't be
             # created unless the target path already exists. This causes
             # problems when the linked file is ordered after the link
@@ -64,12 +64,11 @@ jobs:
         run: |
           brew install ninja
 
-      # TODO(jubianchi): Re-enable this to build on MingW
-      # - name: Install `ninja` on Windows
-      #   if: startsWith(matrix.target.id, 'windows-')
-      #   shell: bash
-      #   run: |
-      #     choco install ninja
+      - name: Install `ninja` on Windows
+        if: startsWith(matrix.target.id, 'windows-')
+        shell: bash
+        run: |
+          choco install ninja
 
       - name: Build
         if: matrix.target.id != 'windows-amd64' && matrix.target.id != 'linux-aarch64' && matrix.target.id != 'linux-riscv64'

build.ps1

@@ -17,7 +17,7 @@ if ([string]::IsNullOrEmpty($LLVM_VERSION)) {
 
 # Clone the LLVM project.
 if (-not (Test-Path -Path "llvm-project" -PathType Container)) {
-	git clone "$LLVM_REPO_URL" llvm-project
+	git clone -b "release/$LLVM_VERSION" --single-branch --depth=1 "$LLVM_REPO_URL" llvm-project
 }
 
 Set-Location llvm-project
@@ -40,18 +40,18 @@ $CROSS_COMPILE = ""
 
 # Run `cmake` to configure the project.
 cmake `
-  -G "Visual Studio 16 2019" `
+  -G "Ninja" `
   -DCMAKE_BUILD_TYPE=MinSizeRel `
   -DCMAKE_INSTALL_PREFIX=destdir `
-  -DLLVM_ENABLE_PROJECTS="clang;lld" `
+  -DLLVM_ENABLE_PROJECTS="polly;lldb;lld;compiler-rt;clang-tools-extra;clang" `
   -DLLVM_ENABLE_TERMINFO=OFF `
   -DLLVM_ENABLE_ZLIB=OFF `
   -DLLVM_INCLUDE_DOCS=OFF `
   -DLLVM_INCLUDE_EXAMPLES=OFF `
   -DLLVM_INCLUDE_GO_TESTS=OFF `
   -DLLVM_INCLUDE_TESTS=OFF `
   -DLLVM_INCLUDE_TOOLS=ON `
-  -DLLVM_INCLUDE_UTILS=OFF `
+  -DLLVM_INCLUDE_UTILS=ON `
   -DLLVM_OPTIMIZED_TABLEGEN=ON `
   -DLLVM_TARGETS_TO_BUILD="X86;AArch64;RISCV;WebAssembly" `
   $CROSS_COMPILE `

build.sh

@@ -23,7 +23,7 @@ fi
 # Clone the LLVM project.
 if [ ! -d llvm-project ]
 then
-  git clone "$LLVM_REPO_URL" llvm-project
+	git clone -b "release/$LLVM_VERSION" --single-branch --depth=1 "$LLVM_REPO_URL" llvm-project
 fi
 
 
@@ -62,15 +62,14 @@ cmake \
   -G Ninja \
   -DCMAKE_BUILD_TYPE=MinSizeRel \
   -DCMAKE_INSTALL_PREFIX="/" \
-  -DLLVM_ENABLE_PROJECTS="clang;lld" \
+  -DLLVM_ENABLE_PROJECTS="polly;lldb;lld;compiler-rt;clang-tools-extra;clang" \
   -DLLVM_ENABLE_TERMINFO=OFF \
   -DLLVM_ENABLE_ZLIB=OFF \
   -DLLVM_INCLUDE_DOCS=OFF \
   -DLLVM_INCLUDE_EXAMPLES=OFF \
-  -DLLVM_INCLUDE_GO_TESTS=OFF \
   -DLLVM_INCLUDE_TESTS=OFF \
   -DLLVM_INCLUDE_TOOLS=ON \
-  -DLLVM_INCLUDE_UTILS=OFF \
+  -DLLVM_INCLUDE_UTILS=ON \
   -DLLVM_OPTIMIZED_TABLEGEN=ON \
   -DLLVM_TARGETS_TO_BUILD="X86;AArch64;RISCV;WebAssembly" \
   "${CROSS_COMPILE}" \