[llvm-commits] [zorg] r160545 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Benjamin Kramer benny.kra at googlemail.com
Fri Jul 20 03:18:32 PDT 2012


Author: d0k
Date: Fri Jul 20 05:18:32 2012
New Revision: 160545

URL: http://llvm.org/viewvc/llvm-project?rev=160545&view=rev
Log:
Fix the environment for two stage clang selfhost builds.

This made a copy of merged_env, updated the copy and then threw it away as
dict.update returns None. Fix by remembering the copy and then updating it.

With the environment being None, the bot built both stages with the host
compiler.

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

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=160545&r1=160544&r2=160545&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Fri Jul 20 05:18:32 2012
@@ -266,7 +266,8 @@
     args = base_configure_args + ["--without-llvmgcc", "--without-llvmgxx"]
     args.append(WithProperties("--prefix=%(builddir)s/" + llvm_2_installdir))
     args += getConfigArgs(stage2_config)
-    local_env = dict(merged_env).update({
+    local_env = dict(merged_env)
+    local_env.update({
         'CC'  : WithProperties("%%(builddir)s/%s/bin/clang"   % llvm_1_installdir),
         'CXX' : WithProperties("%%(builddir)s/%s/bin/clang++" % llvm_1_installdir)})
 





More information about the llvm-commits mailing list