Constrain workaround to avoid affecting other buildbots
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@366122 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd74c27..5df3f25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,8 +151,10 @@
# 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")))
- message(WARNING "OVERRIDING BUILDBOT CONFIG")
- set(LIBCXX_CXX_ABI "default" CACHE STRING "FIXME" FORCE)
+ 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.