Merge pull request #112 from isuruf/fix-race

CMake: fix build race condition

Author: xoviat

runtime/flang/CMakeLists.txt

@@ -475,15 +475,23 @@ SET(FTN_SUPPORT
   xfer.c
   init.c
   xfer_rpm1.c
+  )
+
+add_library(iso_c_bind OBJECT
+  iso_c_bind.F95
+)
+
+add_library(ieee_arithmetic OBJECT
   ieee_arithmetic.F95
   ieee_exceptions.F95
-  iso_c_bind.F95
-  )
+)
 
 add_flang_library(flang_static
   ${FTN_INTRINSICS}
   ${FTN_SUPPORT}
   ${SHARED_SOURCES}
+  $<TARGET_OBJECTS:iso_c_bind>
+  $<TARGET_OBJECTS:ieee_arithmetic>
   )
 
 set_target_properties(flang_static
@@ -497,21 +505,14 @@ else()
   set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang)
 endif()
 
-add_library(iso_c_bind OBJECT
-  iso_c_bind.F95
-)
-
-add_library(ieee_arithmetic OBJECT
-  ieee_arithmetic.F95
-  ieee_exceptions.F95
-)
-
 set(SHARED_LIBRARY TRUE)
 
 add_flang_library(flang_shared
   ${FTN_INTRINSICS}
   ${FTN_SUPPORT}
   ${SHARED_SOURCES}
+  $<TARGET_OBJECTS:iso_c_bind>
+  $<TARGET_OBJECTS:ieee_arithmetic>
   )
 
 set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
@@ -587,14 +588,12 @@ target_include_directories(flang_shared
 add_dependencies(flang_static 
   flang1
   flang2
-  ieee_arithmetic
   )
 
 # Make sure the compiler is built before we bootstrap
 add_dependencies(flang_shared 
   flang1
   flang2
-  ieee_arithmetic
   )
 
 add_dependencies(iso_c_bind