<div dir="ltr">Ouch, hi Galina, <span style="font-family:arial,sans-serif;font-size:12.800000190734863px;white-space:nowrap">Dmitri Gribenko, spotted a very serious error in my patch:</span><div><span style="font-family:arial,sans-serif;font-size:12.800000190734863px;white-space:nowrap"><br>
</span></div><div><span style="font-family:arial,sans-serif;font-size:12.800000190734863px;white-space:nowrap"> </span><span style="font-family:arial,sans-serif;font-size:12.800000190734863px">+ # Prepare environmental variables. Set here all env we want everywhere.</span></div>
<span style="font-family:arial,sans-serif;font-size:12.800000190734863px">+ merged_env = {</span><br style="font-family:arial,sans-serif;font-size:12.800000190734863px"><span style="font-family:arial,sans-serif;font-size:12.800000190734863px">+ 'C' : "clang",</span><br style="font-family:arial,sans-serif;font-size:12.800000190734863px">
<span style="font-family:arial,sans-serif;font-size:12.800000190734863px">+ 'CXX' : "clang++",</span><br style="font-family:arial,sans-serif;font-size:12.800000190734863px"><span style="font-family:arial,sans-serif;font-size:12.800000190734863px">+ 'TERM' : 'dumb' # Be cautious and disable color output from all tools.</span><br style="font-family:arial,sans-serif;font-size:12.800000190734863px">
<span style="font-family:arial,sans-serif;font-size:12.800000190734863px">+ }</span><br style="font-family:arial,sans-serif;font-size:12.800000190734863px"><div><span style="font-family:arial,sans-serif;font-size:12.800000190734863px"><br>
</span></div><div>'C' should be 'CC'. I am sorry about the trouble, but can you fix this right away so we don't break the LLD builders, please? Thank you so much!</div><div><br></div><div><br></div><div>
-- Mikael</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">2013/12/9 Galina Kistanova <span dir="ltr"><<a href="mailto:gkistanova@gmail.com" target="_blank">gkistanova@gmail.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: gkistanova<br>
Date: Mon Dec 9 14:41:04 2013<br>
New Revision: 196813<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=196813&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=196813&view=rev</a><br>
Log:<br>
Patch by Mikael Lyngvig!<br>
Added new builder lld-powerpc-linux-debian and slave for it.<br>
Added env to LLDBuildFactory:<br>
'C' : "clang",<br>
'CXX' : "clang++<br>
<br>
Modified:<br>
zorg/trunk/buildbot/osuosl/master/config/builders.py<br>
zorg/trunk/buildbot/osuosl/master/config/slaves.py<br>
zorg/trunk/zorg/buildbot/builders/LLDBuilder.py<br>
<br>
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=196813&r1=196812&r2=196813&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=196813&r1=196812&r2=196813&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)<br>
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Dec 9 14:41:04 2013<br>
@@ -651,6 +651,17 @@ def _get_lld_builders():<br>
'factory': LLDBuilder.getLLDBuildFactory(jobs=32),<br>
'category' : 'lld'},<br>
<br>
+ {'name': "lld-powerpc-linux-debian",<br>
+ 'slavenames' :["mily-mini-1"],<br>
+ 'builddir': "lld-powerpc-linux-debian",<br>
+ 'factory': LLDBuilder.getLLDBuildFactory(clean=True,<br>
+ jobs=2,<br>
+ env={<br>
+ 'CC' : 'ccache gcc-4.8',<br>
+ 'CXX': 'ccache g++-4.8',<br>
+ 'CCACHE_CPP2' : 'yes',<br>
+ 'LD' : 'ld.gold'}),<br>
+ 'category' : 'lld'},<br>
]<br>
<br>
# Sanitizer builders.<br>
<br>
Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=196813&r1=196812&r2=196813&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=196813&r1=196812&r2=196813&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)<br>
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Dec 9 14:41:04 2013<br>
@@ -242,6 +242,9 @@ def get_build_slaves():<br>
create_slave("mily-odroid-xu-1", properties={'jobs': 4}, max_builds=1),<br>
create_slave("linaro-odroidxu-01", properties={'jobs' : 4}, max_builds=1),<br>
<br>
+ # Debian Linux Mac Mini PowerPC @ 1.25 GHz 1 GB RAM 30 GB HD<br>
+ create_slave("mily-mini-1", properties={'jobs' : 1}, max_builds=1),<br>
+<br>
# Defunct.<br>
# Pentium Dual CPU T3400 @ 2.1GHz<br>
#create_slave("dumitrescu1", properties={'jobs' : 2}, max_builds=1),<br>
<br>
Modified: zorg/trunk/zorg/buildbot/builders/LLDBuilder.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBuilder.py?rev=196813&r1=196812&r2=196813&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBuilder.py?rev=196813&r1=196812&r2=196813&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/zorg/buildbot/builders/LLDBuilder.py (original)<br>
+++ zorg/trunk/zorg/buildbot/builders/LLDBuilder.py Mon Dec 9 14:41:04 2013<br>
@@ -8,7 +8,17 @@ from buildbot.process.properties import<br>
<br>
def getLLDBuildFactory(<br>
clean = True,<br>
- jobs="%(jobs)s"):<br>
+ jobs = "%(jobs)s",<br>
+ env = {}):<br>
+<br>
+ # Prepare environmental variables. Set here all env we want everywhere.<br>
+ merged_env = {<br>
+ 'C' : "clang",<br>
+ 'CXX' : "clang++",<br>
+ 'TERM' : 'dumb' # Be cautious and disable color output from all tools.<br>
+ }<br>
+ if env is not None:<br>
+ merged_env.update(env) # Overwrite pre-set items with the given ones, so user can set anything.<br>
<br>
llvm_srcdir = "llvm.src"<br>
llvm_objdir = "llvm.obj"<br>
@@ -19,6 +29,7 @@ def getLLDBuildFactory(<br>
command=["pwd"],<br>
property="builddir",<br>
description="set build dir",<br>
+ env=merged_env,<br>
workdir="."))<br>
# Get LLVM and Lld<br>
f.addStep(SVN(name='svn-llvm',<br>
@@ -57,9 +68,7 @@ def getLLDBuildFactory(<br>
description=["cmake configure"],<br>
haltOnFailure=True,<br>
command=WithProperties(" ".join(cmakeCommand)),<br>
- env={<br>
- 'CXX': "clang++",<br>
- 'C': "clang"},<br>
+ env=merged_env,<br>
workdir=llvm_objdir))<br>
# Build Lld<br>
f.addStep(ShellCommand(name="build_Lld",<br>
@@ -67,12 +76,14 @@ def getLLDBuildFactory(<br>
'make', WithProperties("-j%s" % jobs)],<br>
haltOnFailure=True,<br>
description=["build lld"],<br>
+ env=merged_env,<br>
workdir=llvm_objdir))<br>
# Test Lld<br>
f.addStep(ShellCommand(name="test_lld",<br>
command=["make", "lld-test"],<br>
haltOnFailure=True,<br>
description=["test lld"],<br>
+ env=merged_env,<br>
workdir=llvm_objdir))<br>
<br>
return f<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>