[Numpy-svn] r6144 - trunk/numpy/distutils/fcompiler

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-12-16 12:04:24 -0600 (Tue, 16 Dec 2008)
New Revision: 6144

Modified:
   trunk/numpy/distutils/fcompiler/gnu.py
Log:
BUG: Do not harcode fortran runtime when copying it on windows. Should fix #969.

Modified: trunk/numpy/distutils/fcompiler/gnu.py
===================================================================
--- trunk/numpy/distutils/fcompiler/gnu.py	2008-12-16 11:21:52 UTC (rev 6143)
+++ trunk/numpy/distutils/fcompiler/gnu.py	2008-12-16 18:04:24 UTC (rev 6144)
@@ -130,10 +130,10 @@
                 # if windows and not cygwin, libg2c lies in a different folder
                 if sys.platform == 'win32' and not d.startswith('/usr/lib'):
                     d = os.path.normpath(d)
-                    if not os.path.exists(os.path.join(d, 'libg2c.a')):
+                    if not os.path.exists(os.path.join(d, "lib%s.a" % self.g2c)):
                         d2 = os.path.abspath(os.path.join(d,
                                                           '../../../../lib'))
-                        if os.path.exists(os.path.join(d2, 'libg2c.a')):
+                        if os.path.exists(os.path.join(d2, "lib%s.a" % self.g2c)):
                             opt.append(d2)
                 opt.append(d)
         return opt