[PATCH] D89452: [flang] Fix build with BUILD_SHARED_LIBS=ON

[serge via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG50df5f24dc33: [flang] Fix build with BUILD_SHARED_LIBS=ON and FLANG_BUILD_NEW_DRIVER=ON (authored by serge-sans-paille).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D89452/new/

https://reviews.llvm.org/D89452

Files:
  flang/lib/Evaluate/CMakeLists.txt
  flang/unittests/Evaluate/CMakeLists.txt
  flang/unittests/Frontend/CMakeLists.txt
  flang/unittests/Runtime/CMakeLists.txt


Index: flang/unittests/Runtime/CMakeLists.txt
===================================================================
--- flang/unittests/Runtime/CMakeLists.txt
+++ flang/unittests/Runtime/CMakeLists.txt
@@ -8,8 +8,14 @@
 )
 llvm_update_compile_flags(RuntimeTesting)
 
+if (LLVM_LINK_LLVM_DYLIB)
+  set(llvm_libs LLVM)
+else()
+  llvm_map_components_to_libnames(llvm_libs Support)
+endif()
 target_link_libraries(RuntimeTesting
   FortranRuntime
+  ${llvm_libs}
 )
 
 add_flang_nongtest_unittest(format
Index: flang/unittests/Frontend/CMakeLists.txt
===================================================================
--- flang/unittests/Frontend/CMakeLists.txt
+++ flang/unittests/Frontend/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 target_link_libraries(FlangFrontendTests
   PRIVATE
-  LLVMSupport
   clangBasic
   clangFrontend
   flangFrontend
Index: flang/unittests/Evaluate/CMakeLists.txt
===================================================================
--- flang/unittests/Evaluate/CMakeLists.txt
+++ flang/unittests/Evaluate/CMakeLists.txt
@@ -3,13 +3,13 @@
   testing.cpp
   fp-testing.cpp
 )
-    if (LLVM_LINK_LLVM_DYLIB)
-      set(llvm_libs LLVM)
-    else()
-      llvm_map_components_to_libnames(llvm_libs Support)
-    endif()
-    target_link_libraries(FortranEvaluateTesting
-	    ${llvm_libs})
+if (LLVM_LINK_LLVM_DYLIB)
+  set(llvm_libs LLVM)
+else()
+  llvm_map_components_to_libnames(llvm_libs Support)
+endif()
+target_link_libraries(FortranEvaluateTesting
+    ${llvm_libs})
 
 add_flang_nongtest_unittest(leading-zero-bit-count
   FortranEvaluateTesting
Index: flang/lib/Evaluate/CMakeLists.txt
===================================================================
--- flang/lib/Evaluate/CMakeLists.txt
+++ flang/lib/Evaluate/CMakeLists.txt
@@ -44,6 +44,9 @@
   FortranParser
   ${LIBPGMATH}
 
+  LINK_COMPONENTS
+  Support
+
   DEPENDS
   acc_gen
   omp_gen


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D89452.298347.patch
Type: text/x-patch
Size: 1873 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201015/f513d697/attachment.bin>