[llvm] c96ddd7 - Update the Windows packaging script.

[Carlos Alberto Enciso via llvm-commits]

Author: Carlos Alberto Enciso
Date: 2022-07-20T07:15:13+01:00
New Revision: c96ddd7019b0e816d176a2a9fb27f6c2a18f068f

URL: https://github.com/llvm/llvm-project/commit/c96ddd7019b0e816d176a2a9fb27f6c2a18f068f
DIFF: https://github.com/llvm/llvm-project/commit/c96ddd7019b0e816d176a2a9fb27f6c2a18f068f.diff

LOG: Update the Windows packaging script.

As discussed on:
https://discourse.llvm.org/t/build-llvm-release-bat-script-options/63146/6

- In stage1 use the following binaries from stage0:
  lld-link, llvm-lib and llvm-windres

Reviewed By: hans

Differential Revision: https://reviews.llvm.org/D130067

Added: 
    

Modified: 
    llvm/utils/release/build_llvm_release.bat

Removed: 
    


################################################################################
diff  --git a/llvm/utils/release/build_llvm_release.bat b/llvm/utils/release/build_llvm_release.bat
index 84ec8f890ed81..7149ff4ddda21 100755
--- a/llvm/utils/release/build_llvm_release.bat
+++ b/llvm/utils/release/build_llvm_release.bat
@@ -160,7 +160,10 @@ REM with forward slash.
 set all_cmake_flags=^
   %cmake_flags% ^
   -DCMAKE_C_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
-  -DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe
+  -DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
+  -DCMAKE_LINKER=%stage0_bin_dir%/lld-link.exe ^
+  -DCMAKE_AR=%stage0_bin_dir%/llvm-lib.exe ^
+  -DCMAKE_RC=%stage0_bin_dir%/llvm-windres.exe
 set cmake_flags=%all_cmake_flags:\=/%
 
 mkdir build32
@@ -227,7 +230,10 @@ REM with forward slash.
 set all_cmake_flags=^
   %cmake_flags% ^
   -DCMAKE_C_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
-  -DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe
+  -DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
+  -DCMAKE_LINKER=%stage0_bin_dir%/lld-link.exe ^
+  -DCMAKE_AR=%stage0_bin_dir%/llvm-lib.exe ^
+  -DCMAKE_RC=%stage0_bin_dir%/llvm-windres.exe
 set cmake_flags=%all_cmake_flags:\=/%
 
 mkdir build64