From d7492232a628fd9741cf1e382fcba86fbb91cce7 Mon Sep 17 00:00:00 2001
From: Nico Weber <nicolasweber@gmx.de>
Date: Fri, 17 May 2019 01:42:37 +0000
Subject: [PATCH] Revert r360946 "Add Clang shared library with C++ exports"

It breaks LLVM_ENABLE_PIC=OFF builds, and it's not clear
if the object library approach doesn't impact the normal
clang binary.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@360973 91177308-0d34-0410-b5e6-96231b3b80d8
---
 cmake/modules/AddClang.cmake      |  7 ++-----
 tools/CMakeLists.txt              |  3 ---
 tools/clang-shlib/CMakeLists.txt  | 13 -------------
 tools/clang-shlib/clang-shlib.cpp |  1 -
 4 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 tools/clang-shlib/CMakeLists.txt
 delete mode 100644 tools/clang-shlib/clang-shlib.cpp

diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake
index b598f13ff6..18bac7172b 100644
--- a/cmake/modules/AddClang.cmake
+++ b/cmake/modules/AddClang.cmake
@@ -81,12 +81,9 @@ macro(add_clang_library name)
       )
   endif()
   if(ARG_SHARED)
-    set(LIBTYPE SHARED)
-  else()
-    set(LIBTYPE STATIC OBJECT)
-    set_property(GLOBAL APPEND PROPERTY CLANG_STATIC_LIBS ${name})
+    set(ARG_ENABLE_SHARED SHARED)
   endif()
-  llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})
+  llvm_add_library(${name} ${ARG_ENABLE_SHARED} ${ARG_UNPARSED_ARGUMENTS} ${srcs})
 
   if(TARGET ${name})
     target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index f5c90ba783..43dfffe149 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -13,9 +13,6 @@ add_clang_subdirectory(c-index-test)
 
 add_clang_subdirectory(clang-rename)
 add_clang_subdirectory(clang-refactor)
-if(UNIX)
-  add_clang_subdirectory(clang-shlib)
-endif()
 
 if(CLANG_ENABLE_ARCMT)
   add_clang_subdirectory(arcmt-test)
diff --git a/tools/clang-shlib/CMakeLists.txt b/tools/clang-shlib/CMakeLists.txt
deleted file mode 100644
index 733ace3ac0..0000000000
--- a/tools/clang-shlib/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-get_property(clang_libs GLOBAL PROPERTY CLANG_STATIC_LIBS)
-
-foreach (lib ${clang_libs})
-  list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)
-  list(APPEND _DEPS $<TARGET_PROPERTY:${lib},INTERFACE_LINK_LIBRARIES>)
-endforeach ()
-
-add_clang_library(clang_shared
-                  SHARED
-                  clang-shlib.cpp
-                  ${_OBJECTS}
-                  LINK_LIBS
-                  ${_DEPS})
diff --git a/tools/clang-shlib/clang-shlib.cpp b/tools/clang-shlib/clang-shlib.cpp
deleted file mode 100644
index 0093622e6a..0000000000
--- a/tools/clang-shlib/clang-shlib.cpp
+++ /dev/null
@@ -1 +0,0 @@
-// Intentionally empty source file to make CMake happy
-- 
2.40.0