Merge pull request #26 from xdoardo/master

Disable LIBXML2 in Windows

Author: syrusakbary

.github/workflows/ci.yml

@@ -70,11 +70,14 @@ jobs:
         run: |
           brew install ninja
 
-      - 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: Setup MSVC (Windows) 
+        uses: ilammy/msvc-dev-cmd@v1
+        if: matrix.target.id == 'windows-amd64'
 
       - name: Build
         if: matrix.target.id != 'windows-amd64' && matrix.target.id != 'linux-aarch64' && matrix.target.id != 'linux-riscv64'
@@ -94,10 +97,11 @@ jobs:
         run: |
           ./build.sh ${{ matrix.llvm_version }} ${{ matrix.llvm_repo_url }} riscv64
 
+     
       - name: Build (Windows)
         if: matrix.target.id == 'windows-amd64'
-        shell: |
-          powershell -Command "& '{0}'"
+        #shell: |
+        #  powershell -Command "& '{0}'"
         run: |
           ./build.ps1 ${{ matrix.llvm_version }} ${{ matrix.llvm_repo_url }}
 

README.md

@@ -49,7 +49,7 @@ assets](https://github.com/wasmerio/llvm-custom-builds/releases).
   </thead>
   <tbody>
     <tr>
-      <td rowspan="5">18</td>
+      <td rowspan="6">18</td>
       <td rowspan="3">amd64</td>
       <td>Darwin</td>
       <td><a href="https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-darwin-amd64.tar.xz">download</a></td>
@@ -66,14 +66,16 @@ assets](https://github.com/wasmerio/llvm-custom-builds/releases).
       <td rowspan="2">aarch64</td>
       <td>Linux</td>
       <td><a href="https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-linux-aarch64.tar.xz">download</a></td>
+    </tr>
+    <tr>
       <td>Darwin</td>
       <td><a href="https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-darwin-aarch64.tar.xz">download</a></td>
     </tr>
-    <tr>
+      </tr>
       <td>riscv64</td>
       <td>Linux</td>
       <td><a href="https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-linux-riscv64.tar.xz">download</a></td>
-    </tr>
+      <tr>
     <tr>
       <td rowspan="5">16</td>
       <td rowspan="3">amd64</td>

build.ps1

@@ -38,16 +38,22 @@ $CMAKE_ARGUMENTS = ""
 # Adjust cross compilation
 $CROSS_COMPILE = ""
 
-# Run `cmake` to configure the project.
+# Run `cmake` to configure the project, using MSVC.
+$CMAKE_CXX_COMPILER="cl.exe"
+$CMAKE_C_COMPILER="cl.exe"
+$CMAKE_LINKER_TYPE="MSVC"
+
 cmake `
   -G "Ninja" `
   -DCMAKE_BUILD_TYPE=MinSizeRel `
   -DCMAKE_INSTALL_PREFIX=destdir `
   -DLLVM_ENABLE_PROJECTS="clang;lld" `
   -DLLVM_ENABLE_TERMINFO=OFF `
   -DLLVM_ENABLE_ZLIB=OFF `
+  -DLLVM_ENABLE_LIBXML2=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 `