diff options
| author | Greg Ward <gward@python.net> | 2000-03-26 21:40:19 (GMT) |
|---|---|---|
| committer | Greg Ward <gward@python.net> | 2000-03-26 21:40:19 (GMT) |
| commit | e21dabe2e0f93aef55bf6a5352527f4874a31489 (patch) | |
| tree | b3563152952dd7dcf29a4d1c739397bf917aa2b8 /Lib/distutils/unixccompiler.py | |
| parent | f10f95d6bb7854ba2b3a8f6b554bcb8baecd7674 (diff) | |
| download | cpython-e21dabe2e0f93aef55bf6a5352527f4874a31489.zip cpython-e21dabe2e0f93aef55bf6a5352527f4874a31489.tar.gz cpython-e21dabe2e0f93aef55bf6a5352527f4874a31489.tar.bz2 | |
Added 'runtime_library_dirs' parameter to 'link_*()' methods, and changed to
use it when linking.
Call '_fix_object_args()' and/or '_fix_lib_args()' as appropriate, rather
than just '_fix_link_args()'.
Diffstat (limited to 'Lib/distutils/unixccompiler.py')
| -rw-r--r-- | Lib/distutils/unixccompiler.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py index ec85571..ec766f5 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -146,7 +146,7 @@ class UnixCCompiler (CCompiler): output_dir=None, debug=0): - (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) @@ -169,6 +169,7 @@ class UnixCCompiler (CCompiler): output_dir=None, libraries=None, library_dirs=None, + runtime_library_dirs=None, debug=0, extra_preargs=None, extra_postargs=None): @@ -178,6 +179,7 @@ class UnixCCompiler (CCompiler): output_dir, libraries, library_dirs, + runtime_library_dirs, debug, extra_preargs, extra_postargs) @@ -189,16 +191,17 @@ class UnixCCompiler (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) 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" @@ -228,16 +231,17 @@ class UnixCCompiler (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) lib_opts = gen_lib_options (self, - library_dirs, self.runtime_library_dirs, + library_dirs, runtime_library_dirs, libraries) output_filename = output_progname # Unix-ism! if output_dir is not None: |