Skip to content

Commit bcab951

Browse files
committed
[libc++] Re-apply workaround for D63883
In reality, this workaround is for the fact that LIBCXX_CXX_ABI=libcxxabi can't be specified on Linux, since libc++abi isn't shipped with the system. Since the build bots explicitly specify LIBCXX_CXX_ABI=libcxxabi, they fail unless we apply the workaround. llvm-svn: 373385
1 parent 32f869e commit bcab951

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

libcxx/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,16 @@ set(LIBCXX_CXX_ABI "default" CACHE STRING
148148
set(CXXABIS none default libcxxabi libcxxrt libstdc++ libsupc++ vcruntime)
149149
set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS})
150150

151+
# FIXME: This is a temporary hack to get the buildbots working while D63883 is in flight.
152+
# Without this all the bots fail while building libc++
153+
if (DEFINED ENV{USER})
154+
if (("$ENV{USER}" STREQUAL "buildbot") OR (("$ENV{USER}" STREQUAL "llvmbb") OR ("$ENV{USER}" STREQUAL "buildslave")))
155+
if (LIBCXX_CXX_ABI STREQUAL "libcxxabi" AND NOT DEFINED LIBCXX_CXX_ABI_INCLUDE_PATHS)
156+
message(WARNING "OVERRIDING BUILDBOT CONFIG")
157+
set(LIBCXX_CXX_ABI "default" CACHE STRING "FIXME" FORCE)
158+
endif()
159+
endif()
160+
endif()
151161
# Setup the default options if LIBCXX_CXX_ABI is not specified.
152162
if (LIBCXX_CXX_ABI STREQUAL "default")
153163
find_path(

0 commit comments

Comments
 (0)