Skip to content

Commit 5d5abb5

Browse files
ldionneliujinye-sys
authored andcommitted
Revert "[libc++] Integrate the PSTL into libc++"
This reverts r366593, which caused unforeseen breakage on the build bots. I'm reverting until the problems have been figured out and fixed. llvm-svn: 366603
1 parent 20ca58a commit 5d5abb5

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,6 @@ if (LLVM_ENABLE_MODULES)
147147
string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
148148
endif()
149149

150-
find_package(ParallelSTL QUIET)
151-
if (NOT TARGET pstl::ParallelSTL)
152-
message(STATUS "Could not find ParallelSTL, libc++abi will not attempt to use it but the build may fail if the libc++ in use needs it to be available.")
153-
endif()
154-
155150
if ("${CMAKE_OSX_ARCHITECTURES}" MATCHES "^(armv6|armv7|armv7s)$")
156151
set(LIBCXXABI_USE_SJLJ_EXCEPTIONS ON)
157152
else()
@@ -165,9 +160,6 @@ if (LIBCXXABI_ENABLE_SHARED)
165160
llvm_setup_rpath(cxxabi_shared)
166161
endif()
167162
target_link_libraries(cxxabi_shared PRIVATE ${LIBCXXABI_SHARED_LIBRARIES} ${LIBCXXABI_LIBRARIES})
168-
if (TARGET pstl::ParallelSTL)
169-
target_link_libraries(cxxabi_shared PUBLIC pstl::ParallelSTL)
170-
endif()
171163
set_target_properties(cxxabi_shared
172164
PROPERTIES
173165
CXX_EXTENSIONS
@@ -216,9 +208,6 @@ endif()
216208
if (LIBCXXABI_ENABLE_STATIC)
217209
add_library(cxxabi_static STATIC ${LIBCXXABI_SOURCES} ${LIBCXXABI_HEADERS})
218210
target_link_libraries(cxxabi_static PRIVATE ${LIBCXXABI_STATIC_LIBRARIES} ${LIBCXXABI_LIBRARIES})
219-
if (TARGET pstl::ParallelSTL)
220-
target_link_libraries(cxxabi_static PUBLIC pstl::ParallelSTL)
221-
endif()
222211
set_target_properties(cxxabi_static
223212
PROPERTIES
224213
CXX_EXTENSIONS

0 commit comments

Comments
 (0)