[Numpy-svn] r4128 - branches/numpy.scons/numpy/distutils/scons

numpy-svn@scip... numpy-svn@scip...
Tue Sep 25 05:50:53 CDT 2007


Author: cdavid
Date: 2007-09-25 05:50:42 -0500 (Tue, 25 Sep 2007)
New Revision: 4128

Modified:
   branches/numpy.scons/numpy/distutils/scons/__init__.py
Log:
* do not add default linkers and co for mingw tool in scons.

Modified: branches/numpy.scons/numpy/distutils/scons/__init__.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/__init__.py	2007-09-25 10:39:34 UTC (rev 4127)
+++ branches/numpy.scons/numpy/distutils/scons/__init__.py	2007-09-25 10:50:42 UTC (rev 4128)
@@ -117,17 +117,18 @@
         t(env)
 
     # =====================================================
-    # Adding default tools for the one we do not customize:
-    for i in [DEF_LINKERS, DEF_CXX_COMPILERS, DEF_ASSEMBLERS, 
-            DEF_FORTRAN_COMPILERS]:
-        t = FindTool(i, env) or i[0]
-        Tool(t)(env)
-
+    # Adding default tools for the one we do not customize: mingw is special according to scons, don;t ask me why, but this does not work as expected for this tool.
+    if not env['cc_opt'] == 'mingw':
+        for i in [DEF_LINKERS, DEF_CXX_COMPILERS, DEF_ASSEMBLERS, 
+                  DEF_FORTRAN_COMPILERS]:
+            t = FindTool(i, env) or i[0]
+            Tool(t)(env)
+			
     for t in FindAllTools(DEF_OTHER_TOOLS, env):
         Tool(t)(env)
 
-    print env.Dump('TOOLS')
-    print Environment().Dump('TOOLS')
+    #print env.Dump('TOOLS')
+    #print Environment().Dump('TOOLS')
     # Adding custom builder
     env['BUILDERS']['NumpySharedLibrary'] = NumpySharedLibrary
     env['BUILDERS']['NumpyCTypes'] = NumpyCTypes



More information about the Numpy-svn mailing list