[llvm-branch-commits] [openmp] 522d80a - [OpenMP] Fix import library installation with MinGW

Hans Wennborg via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Aug 27 05:04:00 PDT 2020


Author: AndreyChurbanov
Date: 2020-08-27T14:03:36+02:00
New Revision: 522d80ab553b42e2feadfd4178932069dfc51d3f

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

LOG: [OpenMP] Fix import library installation with MinGW

Patch by mati865 at gmail.com

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

(cherry picked from commit 1596ea80fdf3410f94ef9a2548701d26cc81c2f5)

Added: 
    

Modified: 
    openmp/runtime/src/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
index 81275c0483dd..19423f58c6c4 100644
--- a/openmp/runtime/src/CMakeLists.txt
+++ b/openmp/runtime/src/CMakeLists.txt
@@ -195,7 +195,7 @@ if(WIN32)
   # the import library is "re-linked" to include kmp_import.cpp which prevents
   # linking of both Visual Studio OpenMP and newly built OpenMP
   set_source_files_properties(kmp_import.cpp PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_CXXFLAGS}")
-  set(LIBOMP_IMP_LIB_FILE ${LIBOMP_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(LIBOMP_IMP_LIB_FILE ${LIBOMP_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX})
   set(LIBOMP_GENERATED_IMP_LIB_FILENAME ${LIBOMP_LIB_FILE}${CMAKE_STATIC_LIBRARY_SUFFIX})
   set_target_properties(omp PROPERTIES
     VERSION ${LIBOMP_VERSION_MAJOR}.${LIBOMP_VERSION_MINOR} # uses /version flag


        


More information about the llvm-branch-commits mailing list