Skip to content

Commit 8abe263

Browse files
rovkatru
authored andcommitted
[flang] Install runtime libs with the toolchain
Make sure that FortranDecimal, FortranRuntime and Fortran_main are installed/packaged even when LLVM_INSTALL_TOOLCHAIN_ONLY is enabled. They are used by flang to link executables, so they should be provided even with minimal installs. Differential Revision: https://reviews.llvm.org/D131670 (cherry picked from commit 467abac)
1 parent f1f55a9 commit 8abe263

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

flang/cmake/modules/AddFlang.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ endmacro()
1818

1919
macro(add_flang_library name)
2020
cmake_parse_arguments(ARG
21-
"SHARED;STATIC"
21+
"SHARED;STATIC;INSTALL_WITH_TOOLCHAIN"
2222
""
2323
"ADDITIONAL_HEADERS"
2424
${ARGN})
@@ -65,7 +65,8 @@ macro(add_flang_library name)
6565

6666
if (TARGET ${name})
6767

68-
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libflang")
68+
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libflang"
69+
OR ARG_INSTALL_WITH_TOOLCHAIN)
6970
get_target_export_arg(${name} Flang export_to_flangtargets UMBRELLA flang-libraries)
7071
install(TARGETS ${name}
7172
COMPONENT ${name}

flang/lib/Decimal/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
add_flang_library(FortranDecimal
2+
add_flang_library(FortranDecimal INSTALL_WITH_TOOLCHAIN
33
binary-to-decimal.cpp
44
decimal-to-binary.cpp
55
)

flang/runtime/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,6 @@ add_flang_library(FortranRuntime
8888

8989
LINK_LIBS
9090
FortranDecimal
91+
92+
INSTALL_WITH_TOOLCHAIN
9193
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
add_flang_library(Fortran_main STATIC
1+
add_flang_library(Fortran_main STATIC INSTALL_WITH_TOOLCHAIN
22
Fortran_main.c
33
)

0 commit comments

Comments
 (0)