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

[Duncan Sands]

Author: baldrick
Date: Wed Jan 25 07:19:09 2012
New Revision: 148955

URL: http://llvm.org/viewvc/llvm-project?rev=148955&view=rev
Log:
Make sure the path update doesn't fail in stage2 due to the plugin
option being considered part of the gcc executable's name.

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=148955&r1=148954&r2=148955&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Wed Jan 25 07:19:09 2012
@@ -104,9 +104,6 @@
       # From this point on build everything using the just built GCC.
       prev_gcc = '%(builddir)s/'+gcc_install_dir+'/bin/gcc'
       prev_gxx = '%(builddir)s/'+gcc_install_dir+'/bin/g++'
-      if prev_plugin is not None:
-        prev_gcc += ' -fplugin=' + prev_plugin
-        prev_gxx += ' -fplugin=' + prev_plugin
 
       # The built libstdc++ and libgcc may well be more recent than the system
       # versions.  Set the library path so that programs compiled with the just
@@ -116,6 +113,7 @@
                                                  command=[WithProperties(prev_gcc),
                                                           '-print-search-dirs'],
                                                  extract_fn=extractSearchPaths,
+                                                 haltOnFailure = True,
                                                  description=['gcc', 'search paths',
                                                               stage], env=cur_env))
       cur_env = cur_env.copy();
@@ -124,6 +122,11 @@
       else:
         cur_env['LD_LIBRARY_PATH'] = WithProperties('%(gcc_libraries)s')
 
+      # Build everything using the DragonEgg plugin from the previous stage.
+      if prev_plugin is not None:
+        prev_gcc += ' -fplugin=' + prev_plugin
+        prev_gxx += ' -fplugin=' + prev_plugin
+
       # Build LLVM with the just built GCC and install it.
       llvm_obj_dir = 'llvm.obj.%s' % stage
       llvm_install_dir = 'llvm.install' # Name is embedded in object files, so