[llvm-branch-commits] [flang] ba485d5 - Link against libclang-cpp.so

[Tom Stellard via llvm-branch-commits]

Author: Tom Stellard
Date: 2021-08-09T23:57:11-07:00
New Revision: ba485d5bd56fd00e2e12522e76788bc52a87a4a9

URL: https://github.com/llvm/llvm-project/commit/ba485d5bd56fd00e2e12522e76788bc52a87a4a9
DIFF: https://github.com/llvm/llvm-project/commit/ba485d5bd56fd00e2e12522e76788bc52a87a4a9.diff

LOG: Link against libclang-cpp.so

Added: 
    

Modified: 
    flang/lib/Frontend/CMakeLists.txt
    flang/lib/FrontendTool/CMakeLists.txt
    flang/tools/flang-driver/CMakeLists.txt
    flang/unittests/Frontend/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang/lib/Frontend/CMakeLists.txt b/flang/lib/Frontend/CMakeLists.txt
index abaa77f6af54d..0f40f1d97f937 100644
--- a/flang/lib/Frontend/CMakeLists.txt
+++ b/flang/lib/Frontend/CMakeLists.txt
@@ -9,7 +9,7 @@ add_flang_library(flangFrontend
   TextDiagnostic.cpp
 
   DEPENDS
-  clangBasic
+  clang-cpp
 
   LINK_LIBS
   FortranParser
@@ -17,8 +17,7 @@ add_flang_library(flangFrontend
   FortranEvaluate
   FortranCommon
   FortranLower
-  clangBasic
-  clangDriver
+  clang-cpp
 
   LINK_COMPONENTS
   Option

diff  --git a/flang/lib/FrontendTool/CMakeLists.txt b/flang/lib/FrontendTool/CMakeLists.txt
index 65e1dd5188ac6..e9e1bba122c6f 100644
--- a/flang/lib/FrontendTool/CMakeLists.txt
+++ b/flang/lib/FrontendTool/CMakeLists.txt
@@ -2,12 +2,11 @@ add_flang_library(flangFrontendTool
   ExecuteCompilerInvocation.cpp
 
   DEPENDS
-  clangBasic
+  clang-cpp
 
   LINK_LIBS
   flangFrontend
-  clangBasic
-  clangDriver
+  clang-cpp
 
   LINK_COMPONENTS
   Option

diff  --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt
index 4c7ad220d223a..76fba10538ce1 100644
--- a/flang/tools/flang-driver/CMakeLists.txt
+++ b/flang/tools/flang-driver/CMakeLists.txt
@@ -23,8 +23,7 @@ target_link_libraries(flang-new
 
 clang_target_link_libraries(flang-new
   PRIVATE
-  clangDriver
-  clangBasic
+  clang-cpp
 )
 
 install(TARGETS flang-new DESTINATION bin)

diff  --git a/flang/unittests/Frontend/CMakeLists.txt b/flang/unittests/Frontend/CMakeLists.txt
index b78adf3f50229..29a2007f6f8c5 100644
--- a/flang/unittests/Frontend/CMakeLists.txt
+++ b/flang/unittests/Frontend/CMakeLists.txt
@@ -5,7 +5,7 @@ add_flang_unittest(FlangFrontendTests
 
 target_link_libraries(FlangFrontendTests
   PRIVATE
-  clangBasic
+  clang-cpp
   flangFrontend
   flangFrontendTool
   FortranParser