Use clang to build on Windows

topjohnwu · Aug 9, 2024 · b265f79 · b265f79
1 parent 62bf82f
commit b265f79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
           msystem: UCRT64
           update: true
           install: make diffutils tar patch unzip gzip
-          pacboy: 7zip:p python:p cmake:p gcc:p ninja:p zstd:p
+          pacboy: 7zip:p python:p cmake:p gcc:p ninja:p zstd:p clang:p lld:p
 
       - name: Build toolchain
         run: |

diff --git a/build-windows.sh b/build-windows.sh
@@ -30,7 +30,8 @@ clean_storage() {
 
 build() {
   set_llvm_cfg LLVM_USE_SYMLINKS TRUE
-  set_build_cfg llvm.static-libstdcpp true
+  set_llvm_cfg LLVM_ENABLE_LLD TRUE
+  set_build_cfg rust.use-lld self-contained
   set_build_cfg dist.include-mingw-linker true
 
   cd rust

diff --git a/config.toml b/config.toml
@@ -47,3 +47,6 @@ llvm-has-rust-patches = false
 
 [target.x86_64-pc-windows-gnu]
 llvm-has-rust-patches = false
+cc = "clang"
+cxx = "clang++"
+linker = "clang"