r360973 - Revert r360946 "Add Clang shared library with C++ exports"

Nico Weber via cfe-commits cfe-commits at lists.llvm.org
Thu May 16 18:42:37 PDT 2019


Author: nico
Date: Thu May 16 18:42:37 2019
New Revision: 360973

URL: http://llvm.org/viewvc/llvm-project?rev=360973&view=rev
Log:
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.

Removed:
    cfe/trunk/tools/clang-shlib/
Modified:
    cfe/trunk/cmake/modules/AddClang.cmake
    cfe/trunk/tools/CMakeLists.txt

Modified: cfe/trunk/cmake/modules/AddClang.cmake
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/modules/AddClang.cmake?rev=360973&r1=360972&r2=360973&view=diff
==============================================================================
--- cfe/trunk/cmake/modules/AddClang.cmake (original)
+++ cfe/trunk/cmake/modules/AddClang.cmake Thu May 16 18:42:37 2019
@@ -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})

Modified: cfe/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CMakeLists.txt?rev=360973&r1=360972&r2=360973&view=diff
==============================================================================
--- cfe/trunk/tools/CMakeLists.txt (original)
+++ cfe/trunk/tools/CMakeLists.txt Thu May 16 18:42:37 2019
@@ -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)




More information about the cfe-commits mailing list