Merged revisions 73445 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73445 | tarek.ziade | 2009-06-16 10:31:01 +0200 (Tue, 16 Jun 2009) | 1 line
starting distutils.ccompiler test coverage and cleanup
........
diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index 875f96f..ff7f9df 100644
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -1151,12 +1151,14 @@
return pp_opts
-def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
+def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
"""Generate linker options for searching library directories and
- linking with specific libraries. 'libraries' and 'library_dirs' are,
- respectively, lists of library names (not filenames!) and search
- directories. Returns a list of command-line options suitable for use
- with some compiler (depending on the two format strings passed in).
+ linking with specific libraries.
+
+ 'libraries' and 'library_dirs' are, respectively, lists of library names
+ (not filenames!) and search directories. Returns a list of command-line
+ options suitable for use with some compiler (depending on the two format
+ strings passed in).
"""
lib_opts = []
@@ -1166,7 +1168,7 @@
for dir in runtime_library_dirs:
opt = compiler.runtime_library_dir_option(dir)
if isinstance(opt, list):
- lib_opts = lib_opts + opt
+ lib_opts.extend(opt)
else:
lib_opts.append(opt)
@@ -1177,14 +1179,14 @@
# pretty nasty way to arrange your C code.
for lib in libraries:
- (lib_dir, lib_name) = os.path.split(lib)
- if lib_dir:
+ lib_dir, lib_name = os.path.split(lib)
+ if lib_dir != '':
lib_file = compiler.find_library_file([lib_dir], lib_name)
- if lib_file:
+ if lib_file is not None:
lib_opts.append(lib_file)
else:
compiler.warn("no library file corresponding to "
"'%s' found (skipping)" % lib)
else:
- lib_opts.append(compiler.library_option (lib))
+ lib_opts.append(compiler.library_option(lib))
return lib_opts