[zorg] r214913 - More libc++ builder fixes.

[Dan Albert]

Author: danalbert
Date: Tue Aug  5 13:45:31 2014
New Revision: 214913

URL: http://llvm.org/viewvc/llvm-project?rev=214913&view=rev
Log:
More libc++ builder fixes.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=214913&r1=214912&r2=214913&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Aug  5 13:45:31 2014
@@ -661,7 +661,8 @@ def _get_libcxx_builders():
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian',
-         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(),
+         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
+             env={'CC': 'clang', 'CXX': 'clang++'}),
          'category': 'libcxx'},
     ]
 

Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=214913&r1=214912&r2=214913&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Tue Aug  5 13:45:31 2014
@@ -18,8 +18,10 @@ reload(phased_builder_utils)
 
 def getLibcxxWholeTree(f, src_root):
     llvm_path = src_root
-    libcxx_path = os.path.join(llvm_path, 'projects/libcxx')
-    libcxxabi_path = os.path.join(llvm_path, 'projects/libcxxabi')
+    libcxx_path = properties.WithProperties(
+        '%(builddir)s/llvm/projects/libcxx')
+    libcxxabi_path = properties.WithProperties(
+        '%(builddir)s/llvm/projects/libcxxabi')
 
     f = phased_builder_utils.SVNCleanupStep(f, llvm_path)
     f.addStep(SVN(name='svn-llvm',
@@ -52,8 +54,8 @@ def getLibcxxAndAbiBuilder(f=None, env={
         description="set build dir",
         workdir="."))
 
-    src_root = os.path.join(properties.Property('builddir'), 'llvm')
-    build_path = os.path.join(properties.Property('builddir'), 'build')
+    src_root = properties.WithProperties('%(builddir)s/llvm')
+    build_path = properties.WithProperties('%(builddir)s/build')
 
     f = getLibcxxWholeTree(f, src_root)