[Numpy-svn] r3028 - in branches/distutils-revamp: command fcompiler

numpy-svn at scipy.org numpy-svn at scipy.org
Wed Aug 16 01:32:43 CDT 2006


Author: cookedm
Date: 2006-08-16 01:32:39 -0500 (Wed, 16 Aug 2006)
New Revision: 3028

Modified:
   branches/distutils-revamp/command/config_compiler.py
   branches/distutils-revamp/fcompiler/__init__.py
Log:
[distutils-rework] look in environment for more things (programs, flags) for Fortran compiler


Modified: branches/distutils-revamp/command/config_compiler.py
===================================================================
--- branches/distutils-revamp/command/config_compiler.py	2006-08-15 09:53:49 UTC (rev 3027)
+++ branches/distutils-revamp/command/config_compiler.py	2006-08-16 06:32:39 UTC (rev 3028)
@@ -31,11 +31,18 @@
         ('f90exec=', None, "specify F90 compiler command"),
         ('f77flags=',None,"specify F77 compiler flags"),
         ('f90flags=',None,"specify F90 compiler flags"),
+        ('ldshared=',None,"shared-library linker command"),
+        ('ld=',None,"static library linker command"),
+        ('ar=',None,"archiver command (ar)"),
+        ('ranlib=',None,"ranlib command"),
         ('opt=',None,"specify optimization flags"),
         ('arch=',None,"specify architecture specific optimization flags"),
         ('debug','g',"compile with debugging information"),
         ('noopt',None,"compile without optimization"),
         ('noarch',None,"compile without arch-dependent optimization"),
+        ('fflags=',None,"extra flags for Fortran compiler"),
+        ('ldflags=',None,"linker flags"),
+        ('arflags=',None,"flags for ar"),
         ]
 
     help_options = [
@@ -51,11 +58,18 @@
         self.f90exec = None
         self.f77flags = None
         self.f90flags = None
+        self.ldshared = None
+        self.ld = None
+        self.ar = None
+        self.ranlib = None
         self.opt = None
         self.arch = None
         self.debug = None
         self.noopt = None
         self.noarch = None
+        self.fflags = None
+        self.ldflags = None
+        self.arflags = None
 
     def finalize_options(self):
         fc = new_fcompiler(compiler=self.fcompiler,

Modified: branches/distutils-revamp/fcompiler/__init__.py
===================================================================
--- branches/distutils-revamp/fcompiler/__init__.py	2006-08-15 09:53:49 UTC (rev 3027)
+++ branches/distutils-revamp/fcompiler/__init__.py	2006-08-16 06:32:39 UTC (rev 3028)
@@ -81,10 +81,10 @@
         compiler_f90 = ('exe.compiler_f90', 'F90', 'f90exec'),
         compiler_fix = ('exe.compiler_fix', 'F90', 'f90exec'),
         version_cmd = ('self.get_version_cmd', None, None),
-        linker_so = ('self.get_linker_so', 'LDSHARED', None),
-        linker_exe = ('self.get_linker_exe', 'LD', None),
-        archiver = (None, 'AR', None),
-        ranlib = (None, 'RANLIB', None),
+        linker_so = ('self.get_linker_so', 'LDSHARED', 'ldshared'),
+        linker_exe = ('self.get_linker_exe', 'LD', 'ld'),
+        archiver = (None, 'AR', 'ar'),
+        ranlib = (None, 'RANLIB', 'ranlib'),
     )
 
     flag_vars = EnvironmentConfig(
@@ -103,10 +103,10 @@
         debug = ('flags.debug', 'FDEBUG', None, None),
         debug_f77 = ('flags.debug_f77', None, None),
         debug_f90 = ('flags.debug_f90', None, None),
-        flags = ('self.get_flags', 'FFLAGS', None),
-        linker_so = ('flags.linker_so', 'LDFLAGS', None),
-        linker_exe = ('flags.linker_exe', 'LDFLAGS', None),
-        ar = ('flags.ar', 'ARFLAGS', None),
+        flags = ('self.get_flags', 'FFLAGS', 'fflags'),
+        linker_so = ('flags.linker_so', 'LDFLAGS', 'ldflags'),
+        linker_exe = ('flags.linker_exe', 'LDFLAGS', 'ldflags'),
+        ar = ('flags.ar', 'ARFLAGS', 'arflags'),
     )
 
     language_map = {'.f':'f77',



More information about the Numpy-svn mailing list