[compiler-rt] Fix wrong output path of external project target in MSVC.

[sunho]

Summary

Fixes wrong output path of external project target in MSVC. It simplifies the conditional to use ".lib" suffix even if MINGW is not defied. (the not MINGW does not hit when MINGW is NOTFOUND) The behavior before this patch in MSVC was outputting ".a" for static libraries.

[mstorsjo]

compiler-rt/cmake/base-config-ix.cmake

156

This change on its own is probably ok.

llvm/runtimes/CMakeLists.txt

66

This change will change how runtime libraries are built for a lot of platforms! You can’t sneak a change like this into a patch that is just labeled to change compiler-rt! Cc @MaskRay @phosek

[MaskRay]

llvm/runtimes/CMakeLists.txt

66

https://discourse.llvm.org/t/rfc-time-to-drop-legacy-runtime-paths/64628/18 @daltenty

[sunho]

llvm/runtimes/CMakeLists.txt

66

Oh I was not correctly understanding the complexity here. I can drop this change in the mean time -- ORC is totally fine to use the new per-targrt directory even in MSVC.

[phosek]

compiler-rt/cmake/base-config-ix.cmake

156

I'm a bit surprised that this is even needed, according to CMake documentation, this should already be the default: https://cmake.org/cmake/help/v3.14/variable/CMAKE_STATIC_LIBRARY_SUFFIX.html

[sunho]

compiler-rt/cmake/base-config-ix.cmake

156

@phosek We're using clang-cl to build runtimes target by llvm_ExternalProject_Add. Cmake seems to be setting ".a" suffix when using clang to build MSVC target. This part is a workaround introduced by https://reviews.llvm.org/D24046 to fight this issue.

[sunho]

Keep only the part relevant for MSVC.

[sunho]

This is actually not related to the conditionals but related to something in my system or cmake which causes it to set MINGW to true. Abandoning this patch as it is going to break clang-cl building case anyways.

compiler-rt/cmake/base-config-ix.cmake

if(APPLE)
   option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
   option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)
   option(COMPILER_RT_ENABLE_TVOS "Enable building for tvOS - Experimental" Off)
 
 else()
   option(COMPILER_RT_DEFAULT_TARGET_ONLY "Build builtins only for the default target" Off)
 endif()
 
-if(WIN32 AND NOT MINGW AND NOT CYGWIN)
+if(MSVC)
   set(CMAKE_SHARED_LIBRARY_PREFIX_C "")
   set(CMAKE_SHARED_LIBRARY_PREFIX_CXX "")
   set(CMAKE_STATIC_LIBRARY_PREFIX_C "")
   set(CMAKE_STATIC_LIBRARY_PREFIX_CXX "")
   set(CMAKE_STATIC_LIBRARY_SUFFIX_C ".lib")
   set(CMAKE_STATIC_LIBRARY_SUFFIX_CXX ".lib")
 endif()
 

llvm/runtimes/CMakeLists.txt

elseif(component_lower MATCHES "^ios|^macos|^tvos|^watchos")
       message(FATAL_ERROR "${error}")
     endif()
   endforeach()
 endfunction()
 
 function(builtin_default_target compiler_rt_path)
   cmake_parse_arguments(ARG "" "" "DEPENDS" ${ARGN})
 
-  set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default ON)
-  # AIX should fold 32-bit & 64-bit arch libraries into a single archive.
-  if (LLVM_TARGET_TRIPLE MATCHES "aix")
-    set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default OFF)
-  endif()
-
   llvm_ExternalProject_Add(builtins
                            ${compiler_rt_path}/lib/builtins
                            DEPENDS ${ARG_DEPENDS}
                            CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
                                       -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
                                       -DLLVM_DEFAULT_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
-                                      -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default}
                                       -DCMAKE_C_COMPILER_WORKS=ON
                                       -DCMAKE_ASM_COMPILER_WORKS=ON
                                       ${COMMON_CMAKE_ARGS}
                                       ${BUILTINS_CMAKE_ARGS}
                            PASSTHROUGH_PREFIXES COMPILER_RT
                                                 DARWIN
                                                 SANITIZER
                            USE_TOOLCHAIN
if(LLVM_INCLUDE_TESTS)
     if(have_tests)
       set_property(GLOBAL APPEND PROPERTY LLVM_ALL_LIT_TESTSUITES ${SUB_LIT_TESTSUITES})
       set_property(GLOBAL APPEND PROPERTY LLVM_ALL_LIT_PARAMS ${SUB_LIT_PARAMS})
       set_property(GLOBAL APPEND PROPERTY LLVM_ALL_LIT_EXTRA_ARGS ${SUB_LIT_EXTRA_ARGS})
     endif()
     list(APPEND test_targets runtimes-test-depends check-runtimes)
   endif()
 
-  set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default ON)
-  # AIX should fold 32-bit & 64-bit arch libraries into a single archive.
-  if (LLVM_TARGET_TRIPLE MATCHES "aix")
-    set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default OFF)
-  endif()
-
   llvm_ExternalProject_Add(runtimes
                            ${CMAKE_CURRENT_SOURCE_DIR}/../../runtimes
                            DEPENDS ${ARG_DEPENDS}
                            # Builtins were built separately above
                            CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
                                       -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
                                       -DLLVM_DEFAULT_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
                                       -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
-                                      -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default}
                                       -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS}
                                       -DCMAKE_C_COMPILER_WORKS=ON
                                       -DCMAKE_CXX_COMPILER_WORKS=ON
                                       -DCMAKE_ASM_COMPILER_WORKS=ON
                                       ${COMMON_CMAKE_ARGS}
                                       ${RUNTIMES_CMAKE_ARGS}
                            PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
                                                 LLVM_USE_LINKER