[flang] Install Fortran_main library

At the moment the Fortran_main library is not installed, so it cannot be found by the driver when run from an install directory. This patch fixes the issue by replacing llvm_add_library with add_flang_library, which already contains all the proper incantations for installing a library. It also enhances add_flang_library to support a STATIC arg which forces the library to be static even when BUILD_SHARED_LIBS is on. Differential Revision: https://reviews.llvm.org/D124759 Co-authored-by: Dan Palermo <[email protected]>
aaryanshukla · May 16, 2022 · 3d2e05d · 3d2e05d
1 parent 05c3fe0
commit 3d2e05d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
@@ -18,7 +18,7 @@ endmacro()
 
 macro(add_flang_library name)
   cmake_parse_arguments(ARG
-    "SHARED"
+    "SHARED;STATIC"
     ""
     "ADDITIONAL_HEADERS"
     ${ARGN})
@@ -53,7 +53,7 @@ macro(add_flang_library name)
   else()
     # llvm_add_library ignores BUILD_SHARED_LIBS if STATIC is explicitly set,
     # so we need to handle it here.
-    if (BUILD_SHARED_LIBS)
+    if (BUILD_SHARED_LIBS AND NOT ARG_STATIC)
       set(LIBTYPE SHARED OBJECT)
     else()
       set(LIBTYPE STATIC OBJECT)

diff --git a/flang/runtime/FortranMain/CMakeLists.txt b/flang/runtime/FortranMain/CMakeLists.txt
@@ -1,3 +1,3 @@
-llvm_add_library(Fortran_main STATIC
+add_flang_library(Fortran_main STATIC
   Fortran_main.c
 )