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

[Sunho Kim via Phabricator via llvm-commits]

sunho updated this revision to Diff 461038.
sunho edited the summary of this revision.
sunho added a comment.

Keep only the part relevant for MSVC.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D133669/new/

https://reviews.llvm.org/D133669

Files:
  compiler-rt/cmake/Modules/AddCompilerRT.cmake
  compiler-rt/cmake/base-config-ix.cmake


Index: compiler-rt/cmake/base-config-ix.cmake
===================================================================
--- compiler-rt/cmake/base-config-ix.cmake
+++ compiler-rt/cmake/base-config-ix.cmake
@@ -153,7 +153,7 @@
   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 "")
Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake
===================================================================
--- compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -389,7 +389,7 @@
       if(COMMAND llvm_setup_rpath)
         llvm_setup_rpath(${libname})
       endif()
-      if(WIN32 AND NOT CYGWIN AND NOT MINGW)
+      if(MSVC)
         set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
         set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
       endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D133669.461038.patch
Type: text/x-patch
Size: 1051 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220918/269d41a9/attachment.bin>