Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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()'.
This commit is contained in:
Greg Ward 2000-03-26 21:42:28 +00:00
parent e21dabe2e0
commit 2f557a2ec4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/distutils/msvccompiler.py
View File

@ -253,8 +253,7 @@ class MSVCCompiler (CCompiler) :
extra_preargs=None, extra_preargs=None,
extra_postargs=None): extra_postargs=None):
(objects, output_dir) = \ (objects, output_dir) = self._fix_object_args (objects, output_dir)
self._fix_link_args (objects, output_dir, takes_libs=0)
output_filename = \ output_filename = \
self.library_filename (output_libname, output_dir=output_dir) self.library_filename (output_libname, output_dir=output_dir)
@ -279,6 +278,7 @@ class MSVCCompiler (CCompiler) :
output_dir=None, output_dir=None,
libraries=None, libraries=None,
library_dirs=None, library_dirs=None,
runtime_library_dirs=None,
debug=0, debug=0,
extra_preargs=None, extra_preargs=None,
extra_postargs=None): extra_postargs=None):
@ -299,16 +299,21 @@ class MSVCCompiler (CCompiler) :
output_dir=None, output_dir=None,
libraries=None, libraries=None,
library_dirs=None, library_dirs=None,
runtime_library_dirs=None,
debug=0, debug=0,
extra_preargs=None, extra_preargs=None,
extra_postargs=None): extra_postargs=None):
(objects, output_dir, libraries, library_dirs) = \ (objects, output_dir) = self._fix_object_args (objects, output_dir)
self._fix_link_args (objects, output_dir, takes_libs=1, (libraries, library_dirs, runtime_library_dirs) = \
libraries=libraries, library_dirs=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, lib_opts = gen_lib_options (self,
library_dirs, self.runtime_library_dirs, library_dirs, runtime_library_dirs,
libraries) libraries)
if type (output_dir) not in (StringType, NoneType): if type (output_dir) not in (StringType, NoneType):
raise TypeError, "'output_dir' must be a string or None" raise TypeError, "'output_dir' must be a string or None"