diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-08-07 21:51:01 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-08-07 21:51:01 +0000 |
| commit | 127af283abee88774c45bccdaafc4a0b52d59d5d (patch) | |
| tree | 3b59974888601b8ffabad6d659f675ac7be0268b /libcxx | |
| parent | 005b22855e6678e5e0e5ab8a324ff3f8fa4c5cd8 (diff) | |
| download | bcm5719-llvm-127af283abee88774c45bccdaafc4a0b52d59d5d.tar.gz bcm5719-llvm-127af283abee88774c45bccdaafc4a0b52d59d5d.zip | |
[libc++] Remove temporary hack for D63883
This should fix the build bots, who now specify explicitly that they're
building against libc++abi.
llvm-svn: 368216
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/CMakeLists.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 0ef0840f1a4..a3d4f4e3163 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -148,16 +148,6 @@ 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") if (LIBCXX_TARGETING_MSVC) |
