Skip to content

Commit ce13f67

Browse files
committedJul 12, 2019
Attempt to override broken buildbot config for libc++abi.
The buildbots were changed to pass -DLIBCXX_CXX_ABI=libcxxabi, but they don't provide an include path for the library, so cxxabi.h is never found while building libc++. This is a temporary change until the buildbots are updated or until D63883 lands in a form that unbreaks the bots llvm-svn: 365847
1 parent 16d3c1a commit ce13f67

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed
 

‎libcxx/CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,14 @@ set(LIBCXX_CXX_ABI "default" CACHE STRING
147147
set(CXXABIS none default libcxxabi libcxxrt libstdc++ libsupc++ vcruntime)
148148
set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS})
149149

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

0 commit comments

Comments
 (0)
Please sign in to comment.