[CMake] Add llvm-lib to Clang bootstrap dependency for LTO builds on Windows

[ikudrin]

Summary

Without this dependency, it is possible that llvm-lib.exe will not be built, in which case CMake will try to use lib.exe to build libraries, but this tool cannot handle bitcode files.

[mstorsjo]

clang/CMakeLists.txt

616

I think I’d prefer to have the condition be MSVC, not WIN32, as we don’t want to use llvm-lib in the case of mingw.

[ikudrin]

• WIN32 -> MSVC

Thanks!

[phosek]

LGTM

clang/CMakeLists.txt

if(APPLE)
       # so that the host object file tools will use the just-built libLTO.
       # However if System Integrity Protection is enabled the DYLD variables
       # will be scrubbed from the environment of any base system commands. This
       # includes /bin/sh, which ninja uses when executing build commands. To
       # work around the envar being filtered away we pass it in as a CMake
       # variable, and have LLVM's CMake append the envar to the archiver calls.
       set(LTO_LIBRARY -DDARWIN_LTO_LIBRARY=${LLVM_SHLIB_OUTPUT_INTDIR}/libLTO.dylib
         -DDYLD_LIBRARY_PATH=${LLVM_LIBRARY_OUTPUT_INTDIR})
-    elseif(NOT WIN32)
+    elseif(WIN32)
+      add_dependencies(clang-bootstrap-deps llvm-lib)
+      set(${CLANG_STAGE}_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-lib)
+    else()
       add_dependencies(clang-bootstrap-deps llvm-ar llvm-ranlib)
       if(NOT BOOTSTRAP_LLVM_ENABLE_LLD AND LLVM_BINUTILS_INCDIR)
         add_dependencies(clang-bootstrap-deps LLVMgold)
       endif()
       set(${CLANG_STAGE}_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar)
       set(${CLANG_STAGE}_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib)
     endif()
   endif()