diff options
| author | Greg Ward <gward@python.net> | 2000-03-06 03:36:50 (GMT) |
|---|---|---|
| committer | Greg Ward <gward@python.net> | 2000-03-06 03:36:50 (GMT) |
| commit | 4ba5da418cb031de58b8727a7c91cbfa4cf16936 (patch) | |
| tree | 378afbd452a880276049d7506f92f4f481849765 /Lib | |
| parent | 272cbb4974a98478b08a72acb818ca18889e9427 (diff) | |
| download | cpython-4ba5da418cb031de58b8727a7c91cbfa4cf16936.zip cpython-4ba5da418cb031de58b8727a7c91cbfa4cf16936.tar.gz cpython-4ba5da418cb031de58b8727a7c91cbfa4cf16936.tar.bz2 | |
Don't pass 'keep_dir' to 'compile()' method of CCompiler -- no longer used.
Don't assume that the 'libraries' and 'library_dirs' elements of the
build info dict are always lists.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/command/build_ext.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index bbdf062..050a5c6 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -245,7 +245,6 @@ class build_ext (Command): include_dirs = build_info.get ('include_dirs') objects = self.compiler.compile (sources, output_dir=self.build_temp, - keep_dir=1, macros=macros, include_dirs=include_dirs, debug=self.debug) @@ -256,8 +255,10 @@ class build_ext (Command): extra_objects = build_info.get ('extra_objects') if extra_objects: objects.extend (extra_objects) - libraries = self.libraries + build_info.get ('libraries') - library_dirs = self.library_dirs + build_info.get ('library_dirs') + libraries = (self.libraries + + (build_info.get ('libraries') or [])) + library_dirs = (self.library_dirs + + (build_info.get ('library_dirs') or [])) extra_args = build_info.get ('extra_link_args') or [] if self.compiler.compiler_type == 'msvc': |