Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1306,8 +1306,13 @@
                         'CMAKE_BUILD_TYPE': 'Release',
                         'CMAKE_C_COMPILER': 'gcc',
                         'CMAKE_CXX_COMPILER': 'g++',
-                        'CMAKE_AR': '/usr/bin/ar'},
-                    build_standalone=True)},
+                        'CMAKE_AR': '/usr/bin/ar',
+                        'LIBCXX_CXX_ABI': 'libstdc++',
+                        'LIBCXX_CXX_ABI_INCLUDE_PATHS': '/opt/freeware/lib/gcc/powerpc-ibm-aix7.2.0.0/8/include/c++;/opt/freeware/lib/gcc/powerpc-ibm-aix7.2.0.0/8/include/c++/powerpc-ibm-aix7.2.0.0',
+                        'CMAKE_THREAD_LIBS_INIT': '-lpthread',
+                        'LIBCXX_ENABLE_STATIC:BOOL': 'OFF',
+                        'LIBCXX_ENABLE_ABI_LINKER_SCRIPT': 'OFF'},
+                    depends_on_projects=['libcxx'])},
 
     {'name': "fuchsia-x86_64-linux",
     'tags'  : ["toolchain"],
Index: zorg/buildbot/builders/LibcxxAndAbiBuilder.py
===================================================================
--- zorg/buildbot/builders/LibcxxAndAbiBuilder.py
+++ zorg/buildbot/builders/LibcxxAndAbiBuilder.py
@@ -27,17 +27,20 @@
     if depends_on_projects is None:
         depends_on_projects = ['libcxx','libcxxabi','libunwind']
 
-    if build_standalone:
-        src_root = 'runtimes'
-    else:
-        src_root = 'llvm'
+    src_root = 'llvm'
 
     build_path = 'build'
 
+    if build_standalone:
+        src_to_build_dir = 'runtimes'
+    else:
+       src_to_build_dir = None
+
     if f is None:
         f = UnifiedTreeBuilder.getLLVMBuildFactoryAndSourcecodeSteps(
                 depends_on_projects=depends_on_projects,
                 llvm_srcdir=src_root,
+                src_to_build_dir=src_to_build_dir,
                 obj_dir=build_path,
                 **kwargs) # Pass through all the extra arguments.