[libcxx-commits] [libcxx] r366122 - Constrain workaround to avoid affecting other buildbots

[Eric Fiselier via libcxx-commits]

Author: ericwf
Date: Mon Jul 15 12:53:42 2019
New Revision: 366122

URL: http://llvm.org/viewvc/llvm-project?rev=366122&view=rev
Log:
Constrain workaround to avoid affecting other buildbots

Modified:
    libcxx/trunk/CMakeLists.txt

Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=366122&r1=366121&r2=366122&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Mon Jul 15 12:53:42 2019
@@ -151,8 +151,10 @@ set_property(CACHE LIBCXX_CXX_ABI PROPER
 # 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.