Dependency fix

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRTOffload.cmake

@@ -105,6 +105,13 @@ macro(enable_omp_offload_compilation name files)
       set_source_files_properties(${files}
         PROPERTIES COMPILE_DEFINITIONS OMP_OFFLOAD_BUILD
         )
+
+     # If building flang-rt together with libomp, ensure that libomp is built first and found because -fopenmp will try to link it.
+     if (TARGET omp)
+       add_dependencies(${name} omp)
+       target_link_options(${name}.static PUBLIC "-L$<TARGET_FILE_DIR:omp>")
+       #target_link_libraries(${name}.static PRIVATE omp)
+     endif ()
     else()
       message(FATAL_ERROR
         "Flang-rt build with OpenMP offload is not supported for these compilers:\n"

flang-rt/unittests/CMakeLists.txt

@@ -53,10 +53,9 @@ function(add_flangrt_unittest_offload_properties target)
   # FIXME: replace 'native' in --offload-arch option with the list
   #        of targets that Fortran Runtime was built for.
   if (FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "OpenMP")
-    set_target_properties(${target}
-      PROPERTIES LINK_OPTIONS
-      "-fopenmp;--offload-arch=native"
-      )
+      set_property(TARGET   ${target}  APPEND
+        PROPERTY LINK_OPTIONS "-fopenmp;--offload-arch=native"
+        )
   endif()
 endfunction()