[zorg] r174703 - Neaten up the paths to the MPFR, GMP and MPC libraries, which are now available

[Duncan Sands]

Author: baldrick
Date: Fri Feb  8 05:07:44 2013
New Revision: 174703

URL: http://llvm.org/viewvc/llvm-project?rev=174703&view=rev
Log:
Neaten up the paths to the MPFR, GMP and MPC libraries, which are now available
via symbolic links.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=174703&r1=174702&r2=174703&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Feb  8 05:07:44 2013
@@ -409,9 +409,9 @@ def _get_dragonegg_builders():
          'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@194776',
                                                                       extra_languages=['fortran', 'objc', 'obj-c++'],
                                                                       extra_gcc_configure_args=['--disable-bootstrap', '--enable-checking',
-                                                                                                '--with-mpfr=/opt/cfarm/mpfr-2.4.1',
-                                                                                                '--with-gmp=/opt/cfarm/gmp-4.3.2',
-                                                                                                '--with-mpc=/opt/cfarm/mpc-0.8'],
+                                                                                                '--with-mpfr=/opt/cfarm/mpfr',
+                                                                                                '--with-gmp=/opt/cfarm/gmp',
+                                                                                                '--with-mpc=/opt/cfarm/mpc'],
                                                                       extra_llvm_configure_args=['--enable-optimized', '--enable-assertions', '--enable-expensive-checks'],
                                                                       timeout=120),
          'category'   : 'dragonegg'},
@@ -432,9 +432,9 @@ def _get_dragonegg_builders():
          'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@194776',
                                                                       extra_languages=['fortran', 'objc', 'obj-c++'],
                                                                       extra_gcc_configure_args=['--disable-bootstrap', '--enable-checking',
-                                                                                                '--with-mpfr=/opt/cfarm/mpfr-2.4.1',
-                                                                                                '--with-gmp=/opt/cfarm/gmp-4.3.2',
-                                                                                                '--with-mpc=/opt/cfarm/mpc-0.8'],
+                                                                                                '--with-mpfr=/opt/cfarm/mpfr',
+                                                                                                '--with-gmp=/opt/cfarm/gmp',
+                                                                                                '--with-mpc=/opt/cfarm/mpc'],
                                                                       extra_llvm_configure_args=['--disable-optimized', '--enable-assertions']),
          'category'   : 'dragonegg'},
 
@@ -483,9 +483,9 @@ def _get_dragonegg_builders():
          'builddir'   : 'dragonegg-x86_64-linux-gcc-4.5-self-host',
          'factory'    : DragonEggBuilder.getDragonEggBootstrapFactory(gcc_repository='http://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@188355',
                                                                       extra_languages=['fortran', 'objc', 'obj-c++'],
-                                                                      extra_gcc_configure_args=['--disable-bootstrap', '--disable-multilib', '--enable-checking', '--with-mpfr=/opt/cfarm/mpfr-2.4.1', '--with-gmp=/opt/cfarm/gmp-4.2.4', '--with-mpc=/opt/cfarm/mpc-0.8', '--with-libelf=/opt/cfarm/libelf-0.8.12'],
+                                                                      extra_gcc_configure_args=['--disable-bootstrap', '--disable-multilib', '--enable-checking', '--with-mpfr=/opt/cfarm/mpfr', '--with-gmp=/opt/cfarm/gmp', '--with-mpc=/opt/cfarm/mpc', '--with-libelf=/opt/cfarm/libelf-0.8.12'],
                                                                       extra_llvm_configure_args=['--enable-optimized', '--enable-assertions'],
-                                                                      env={'CPPFLAGS' : '-I/opt/cfarm/mpfr-2.4.1/include -I/opt/cfarm/gmp-4.2.4/include/ -I/opt/cfarm/mpc-0.8/include/'}),
+                                                                      env={'CPPFLAGS' : '-I/opt/cfarm/mpfr/include -I/opt/cfarm/gmp/include/ -I/opt/cfarm/mpc/include/'}),
          'category'   : 'dragonegg'},
 
         ]