[llvm-commits] [zorg] r170282 - /zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py

[Duncan Sands]

Author: baldrick
Date: Sun Dec 16 03:18:24 2012
New Revision: 170282

URL: http://llvm.org/viewvc/llvm-project?rev=170282&view=rev
Log:
Try to fix dragonegg buildbot breakage due to programs being linked with multiple
versions of libgcc.

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

Modified: zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py?rev=170282&r1=170281&r2=170282&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Sun Dec 16 03:18:24 2012
@@ -136,6 +136,10 @@
                                                  description=['gcc', 'search paths',
                                                               stage], env=cur_env))
       cur_env = cur_env.copy();
+      if 'LIBRARY_PATH' in env:
+        cur_env['LIBRARY_PATH'] = WithProperties('%(gcc_libraries)s'+':'+env['LIBRARY_PATH'])
+      else:
+        cur_env['LIBRARY_PATH'] = WithProperties('%(gcc_libraries)s')
       if 'LD_LIBRARY_PATH' in env:
         cur_env['LD_LIBRARY_PATH'] = WithProperties('%(gcc_libraries)s'+':'+env['LD_LIBRARY_PATH'])
       else: