diff options
| author | Eric Fiselier <eric@efcs.ca> | 2019-07-15 19:53:42 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2019-07-15 19:53:42 +0000 |
| commit | c5d7b0c4547263fd859e0c7be535575858fd312a (patch) | |
| tree | 9bbe3bfeb6c796624310601a6a47ce8853d7f45a /libcxx | |
| parent | c8291c94f8393162241a798df49ba53fddc49976 (diff) | |
| download | bcm5719-llvm-c5d7b0c4547263fd859e0c7be535575858fd312a.tar.gz bcm5719-llvm-c5d7b0c4547263fd859e0c7be535575858fd312a.zip | |
Constrain workaround to avoid affecting other buildbots
llvm-svn: 366122
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index fd74c2742e0..5df3f257294 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -151,8 +151,10 @@ set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS}) # 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. |
