Skip to content

[Flang][runtime] Add dependency to build FortranRuntime after flang-new #99737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 22, 2024
Merged

[Flang][runtime] Add dependency to build FortranRuntime after flang-new #99737

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4702cc
[Flang][runtime] Add dependency to build FortranRuntime after flang-new
mjklemm Jul 20, 2024
5367670
Also depend on module_files
mjklemm Jul 20, 2024
4c1e846
Disable dependency on Flang if built as a separate project
mjklemm Jul 20, 2024
fbc6f3e
Update flang/runtime/CMakeLists.txt
mjklemm Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions flang/runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Loading