Added 'runtime_library_dirs' parameter to 'link_*()' methods, and warn that

  we don't know what to do with it when we see it.
Call '_fix_object_args()' and/or '_fix_lib_args()' as appropriate, rather
  than just '_fix_link_args()'.

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 7324b8e1c622c123c8b63923fa071a814e666577..bc27cea9b711fa7217b662f58a29d2b29f86a4df 100644 (file)
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -253,8 +253,7 @@ class MSVCCompiler (CCompiler) :
                            extra_preargs=None,
                            extra_postargs=None):
 
-        (objects, output_dir) = \
-            self._fix_link_args (objects, output_dir, takes_libs=0)
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
         output_filename = \
             self.library_filename (output_libname, output_dir=output_dir)
 
@@ -279,6 +278,7 @@ class MSVCCompiler (CCompiler) :
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         runtime_library_dirs=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
@@ -299,16 +299,21 @@ class MSVCCompiler (CCompiler) :
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
+                            runtime_library_dirs=None,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
 
-        (objects, output_dir, libraries, library_dirs) = \
-            self._fix_link_args (objects, output_dir, takes_libs=1,
-                                 libraries=libraries, library_dirs=library_dirs)
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+
+        if self.runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
         
         lib_opts = gen_lib_options (self,
-                                    library_dirs, self.runtime_library_dirs,
+                                    library_dirs, runtime_library_dirs,
                                     libraries)
         if type (output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"