[llvm-branch-commits] [flang] bb93426 - Revert "Link against libclang-cpp.so"

[Tom Stellard via llvm-branch-commits]

Author: Tom Stellard
Date: 2021-08-10T15:32:49-07:00
New Revision: bb934263aca9fa57c2cb3550e605a4471d149cee

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

LOG: Revert "Link against libclang-cpp.so"

This reverts commit ba485d5bd56fd00e2e12522e76788bc52a87a4a9.

This was committed on accident.

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 0f40f1d97f937..abaa77f6af54d 100644
--- a/flang/lib/Frontend/CMakeLists.txt
+++ b/flang/lib/Frontend/CMakeLists.txt
@@ -9,7 +9,7 @@ add_flang_library(flangFrontend
   TextDiagnostic.cpp
 
   DEPENDS
-  clang-cpp
+  clangBasic
 
   LINK_LIBS
   FortranParser
@@ -17,7 +17,8 @@ add_flang_library(flangFrontend
   FortranEvaluate
   FortranCommon
   FortranLower
-  clang-cpp
+  clangBasic
+  clangDriver
 
   LINK_COMPONENTS
   Option

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

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

diff  --git a/flang/unittests/Frontend/CMakeLists.txt b/flang/unittests/Frontend/CMakeLists.txt
index 29a2007f6f8c5..b78adf3f50229 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
-  clang-cpp
+  clangBasic
   flangFrontend
   flangFrontendTool
   FortranParser