diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-10-01 19:27:38 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-10-01 19:27:38 +0000 |
| commit | bcab95182b3745960851c723c018268c2534d6a3 (patch) | |
| tree | 85bd4646ba59c00af82fbfd9205dd6de3b5b261d | |
| parent | 32f869e0eecc8124ac33f10421fbf3cb80df5492 (diff) | |
| download | bcm5719-llvm-bcab95182b3745960851c723c018268c2534d6a3.tar.gz bcm5719-llvm-bcab95182b3745960851c723c018268c2534d6a3.zip | |
[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
| -rw-r--r-- | libcxx/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 06c39e51f11..37a1e3fc082 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -148,6 +148,16 @@ 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") OR ("$ENV{USER}" STREQUAL "buildslave"))) + if (LIBCXX_CXX_ABI STREQUAL "libcxxabi" AND NOT DEFINED LIBCXX_CXX_ABI_INCLUDE_PATHS) + message(WARNING "OVERRIDING BUILDBOT CONFIG") + set(LIBCXX_CXX_ABI "default" CACHE STRING "FIXME" FORCE) + endif() + endif() +endif() # Setup the default options if LIBCXX_CXX_ABI is not specified. if (LIBCXX_CXX_ABI STREQUAL "default") find_path( |
