Merge pull request #4 from albertziegenhagel/windows

Windows linker issues
flang-compiler · Oct 25, 2017 · 50b299e · 50b299e
2 parents acc48f6 + 970f43b
commit 50b299e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/runtime/flang/CMakeLists.txt b/runtime/flang/CMakeLists.txt
@@ -579,6 +579,9 @@ add_dependencies(flang_shared
 if (NOT MSVC)
   target_compile_options(flang_static PRIVATE -fPIC)
   target_compile_options(flang_shared PRIVATE -fPIC)
+else()
+  set_target_properties(flang_static PROPERTIES LINKER_LANGUAGE CXX)
+  set_target_properties(flang_shared PROPERTIES LINKER_LANGUAGE CXX)
 endif()
 
 target_compile_options(flang_static PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-Mreentrant>)

diff --git a/runtime/flangrti/CMakeLists.txt b/runtime/flangrti/CMakeLists.txt
@@ -234,6 +234,8 @@ set_target_properties(flangrti_shared flangrti_static
 if (NOT MSVC)
   target_compile_options(flangrti_static PRIVATE -fPIC)
   target_compile_options(flangrti_shared PRIVATE -fPIC)
+else()
+  set_target_properties(flangrti_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 endif()
 
 target_compile_options(flangrti_static PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-Mreentrant>)