diff options
| author | Greg Ward <gward@python.net> | 2000-03-26 21:42:28 (GMT) |
|---|---|---|
| committer | Greg Ward <gward@python.net> | 2000-03-26 21:42:28 (GMT) |
| commit | 2f557a2ec46afe5cc699f47baae6aaba52ba7553 (patch) | |
| tree | 32e3fefe1ed6f8b3b5b33de042435a2596b21910 /Lib | |
| parent | e21dabe2e0f93aef55bf6a5352527f4874a31489 (diff) | |
| download | cpython-2f557a2ec46afe5cc699f47baae6aaba52ba7553.zip cpython-2f557a2ec46afe5cc699f47baae6aaba52ba7553.tar.gz cpython-2f557a2ec46afe5cc699f47baae6aaba52ba7553.tar.bz2 | |
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()'.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/msvccompiler.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py index 7324b8e..bc27cea 100644 --- 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" |