From 62530b44f45476bc6ff1806e5bf307f1f9725482 Mon Sep 17 00:00:00 2001 From: Michael Klemm Date: Mon, 22 Jul 2024 17:30:45 +0200 Subject: [PATCH] [Flang][runtime] Add dependency to build FortranRuntime after flang-new (#99737) Makefile-based builds did not have proper dependencies to built the FortranRuntime target after Flang new is available. This PR introduces a dependency to ensure that this is the case. Relates to PR #95388. --------- Co-authored-by: Michael Kruse --- flang/runtime/CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index 8588af7e16eeca..d587fd44b1678d 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -295,3 +295,15 @@ else() FortranRuntime.static_dbg FortranRuntime.dynamic_dbg) endif() set_target_properties(FortranRuntime PROPERTIES FOLDER "Flang/Runtime Libraries") + +# If FortranRuntime is part of a Flang build (and not a separate build) then +# add dependency to make sure that Fortran runtime library is being built after +# we have the Flang compiler available. This also includes the MODULE files +# that compile when the 'flang-new' target is built. +# +# TODO: This is a workaround and should be updated when runtime build procedure +# is changed to a regular runtime build. See discussion in PR #95388. +if (TARGET flang-new AND TARGET module_files) + add_dependencies(FortranRuntime flang-new module_files) +endif() +