diff options
| author | Eric Fiselier <eric@efcs.ca> | 2019-07-12 00:02:49 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2019-07-12 00:02:49 +0000 |
| commit | ce13f67618080e0b3715b9aaf6a628e69b32108e (patch) | |
| tree | 796556654807b123fad13384b27acc68de0f2fef /libcxx | |
| parent | 16d3c1ac03d34f215f253d7990b7bad7ad4cdebf (diff) | |
| download | bcm5719-llvm-ce13f67618080e0b3715b9aaf6a628e69b32108e.tar.gz bcm5719-llvm-ce13f67618080e0b3715b9aaf6a628e69b32108e.zip | |
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
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 4a7d94549ff..bb7bde13ad6 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -147,6 +147,14 @@ set(LIBCXX_CXX_ABI "default" CACHE STRING set(CXXABIS none default libcxxabi libcxxrt libstdc++ libsupc++ vcruntime) set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS}) +# FIXME: This is a temporary hack to get the buildbots working while D63883 is in flight. +# Without this all the bots fail while building libc++ +if (DEFINED ENV{USER}) + if (("$ENV{USER}" STREQUAL "buildbot") OR ("$ENV{USER}" STREQUAL "llvmbb")) + message(WARNING "OVERRIDING BUILDBOT CONFIG") + set(LIBCXX_CXX_ABI "default" CACHE STRING "FIXME" FORCE) + endif() +endif() # Setup the default options if LIBCXX_CXX_ABI is not specified. if (LIBCXX_CXX_ABI STREQUAL "default") find_path( |
