[Bug #599248] ext module generation problem

If you have source files srcdir1/foo.c and srcdir2/foo.c, the
temporary .o for both files is written to build/temp.<platform>/foo.o.
This patch sets strip_dir to false for both calls to object_filename,
so now the object files are written to temp.<platform>/srcdir1/foo.o
and .../srcdir2/foo.o.

2.2 bugfix candidate

diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index 8898f51f591f028fd89a367bb1c75a67edc887fa..8aca058b0fd4e2caea0c24e45a07d4e0fb2c786d 100644 (file)
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -366,7 +366,7 @@ class CCompiler:
             extra = []
 
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, 1, outdir)
+        objects = self.object_filenames(sources, 0, outdir)
         assert len(objects) == len(sources)
 
         # XXX should redo this code to eliminate skip_source entirely.
@@ -472,7 +472,7 @@ class CCompiler:
         which source files can be skipped.
         """
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, strip_dir=1,
+        objects = self.object_filenames(sources, strip_dir=0,
                                         output_dir=output_dir)
         assert len(objects) == len(sources)