Commit 4ba5da41 authored by Greg Ward's avatar Greg Ward

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.
parent 272cbb49
...@@ -245,7 +245,6 @@ class build_ext (Command): ...@@ -245,7 +245,6 @@ class build_ext (Command):
include_dirs = build_info.get ('include_dirs') include_dirs = build_info.get ('include_dirs')
objects = self.compiler.compile (sources, objects = self.compiler.compile (sources,
output_dir=self.build_temp, output_dir=self.build_temp,
keep_dir=1,
macros=macros, macros=macros,
include_dirs=include_dirs, include_dirs=include_dirs,
debug=self.debug) debug=self.debug)
...@@ -256,8 +255,10 @@ class build_ext (Command): ...@@ -256,8 +255,10 @@ class build_ext (Command):
extra_objects = build_info.get ('extra_objects') extra_objects = build_info.get ('extra_objects')
if extra_objects: if extra_objects:
objects.extend (extra_objects) objects.extend (extra_objects)
libraries = self.libraries + build_info.get ('libraries') libraries = (self.libraries +
library_dirs = self.library_dirs + build_info.get ('library_dirs') (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 [] extra_args = build_info.get ('extra_link_args') or []
if self.compiler.compiler_type == 'msvc': if self.compiler.compiler_type == 'msvc':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment