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.

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index bbdf062bd6bd1da00b479482432f00f2d97a68d0..050a5c65b75e40231c51f19a61942a5ae77eb5e4 100644 (file)
--- 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':