[zorg] r365252 - Force the LibcxxAndABIBuilder to use libc++abi when building libc++

[Eric Fiselier via llvm-commits]

Author: ericwf
Date: Fri Jul  5 15:43:37 2019
New Revision: 365252

URL: http://llvm.org/viewvc/llvm-project?rev=365252&view=rev
Log:
Force the LibcxxAndABIBuilder to use libc++abi when building libc++

(unless otherwise specified)

Modified:
    zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=365252&r1=365251&r2=365252&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Fri Jul  5 15:43:37 2019
@@ -94,6 +94,10 @@ def getLibcxxAndAbiBuilder(f=None, env={
     if check_libcxx_abilist and not 'CMAKE_BUILD_TYPE' in cmake_extra_opts:
        cmake_opts.append('-DCMAKE_BUILD_TYPE=RELWITHDEBINFO')
 
+    # Force libc++ to use the in-tree libc++abi unless otherwise specified.
+    if 'LIBCXX_CXX_ABI' not in cmake_extra_opts:
+        cmake_opts.append('-DLIBCXX_CXX_ABI=libcxxabi')
+
     # Nuke/remake build directory and run CMake
     f.addStep(buildbot.steps.shell.ShellCommand(
         name='rm.builddir', command=['rm', '-rf', build_path],