[Numpy-svn] r4546 - in branches/numpy.scons/numpy/distutils/scons: core tools

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-12-04 05:01:23 -0600 (Tue, 04 Dec 2007)
New Revision: 4546

Modified:
   branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py
   branches/numpy.scons/numpy/distutils/scons/tools/mingw.py
Log:
Handle LINKFLAGSEND and co in mingw scons tool for mingw case

Modified: branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py	2007-12-04 10:31:29 UTC (rev 4545)
+++ branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py	2007-12-04 11:01:23 UTC (rev 4546)
@@ -170,21 +170,21 @@
                     # Intel Compiler SCons.Tool has a special way to set the
                     # path, so we use this one instead of changing
                     # env['ENV']['PATH'].
-                    t = Tool(env['cc_opt'], 
+                    t = Tool(env['cc_opt'], toolpath = [get_local_toolpath()], 
                              topdir = os.path.split(env['cc_opt_path'])[0])
                     t(env) 
                     customize_cc(t.name, env)
                 else:
                     if is_cc_suncc(pjoin(env['cc_opt_path'], env['cc_opt'])):
                         env['cc_opt'] = 'suncc'
-                    t = Tool(env['cc_opt'])
+                    t = Tool(env['cc_opt'], toolpath = [get_local_toolpath()])
                     t(env) 
                     customize_cc(t.name, env)
                     path_list.append(env['cc_opt_path'])
             else:
                 # Do not care about PATH info because none given from scons
                 # distutils command
-                t = Tool(env['cc_opt'])
+                t = Tool(env['cc_opt'], toolpath = [get_local_toolpath()])
                 t(env) 
                 customize_cc(t.name, env)
         except EnvironmentError, e:
@@ -192,7 +192,7 @@
             raise AssertionError("SCONS: Could not initialize tool ? Error is %s" % \
                                  str(e))
     else:
-        t = Tool(FindTool(DEF_C_COMPILERS, env))
+        t = Tool(FindTool(DEF_C_COMPILERS, env), toolpath = [get_local_toolpath()])
         t(env)
         customize_cc(t.name, env)
 
@@ -355,9 +355,12 @@
     env['SHLINKFLAGSEND'] = ['$LINKFLAGSEND']
     env['LDMODULEFLAGSEND'] = []
 
-    env['LINKCOM'] = '%s $LINKFLAGSEND' % env['LINKCOM']
-    env['SHLINKCOM'] = '%s $SHLINKFLAGSEND' % env['SHLINKCOM']
-    env['LDMODULECOM'] = '%s $LDMODULEFLAGSEND' % env['LDMODULECOM']
+    
+    # For mingw tools, we do it in our custom mingw scons tool
+    if not env['cc_opt'] == 'mingw':
+        env['LINKCOM'] = '%s $LINKFLAGSEND' % env['LINKCOM']
+        env['SHLINKCOM'] = '%s $SHLINKFLAGSEND' % env['SHLINKCOM']
+        env['LDMODULECOM'] = '%s $LDMODULEFLAGSEND' % env['LDMODULECOM']
 
     # Put config code and log in separate dir for each subpackage
     from utils import curry

Modified: branches/numpy.scons/numpy/distutils/scons/tools/mingw.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/tools/mingw.py	2007-12-04 10:31:29 UTC (rev 4545)
+++ branches/numpy.scons/numpy/distutils/scons/tools/mingw.py	2007-12-04 11:01:23 UTC (rev 4546)
@@ -64,6 +64,7 @@
     def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
     if def_target: cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature))
 
+    cmd.extend(['$SHLINKFLAGSEND'])
     return [cmd]
 
 def shlib_emitter(target, source, env):