Merge pull request #199 from mrbean-bremen/issue3591

Fixed accumulating include dirs after compile

Author: jaraco

distutils/ccompiler.py

@@ -389,7 +389,7 @@ def _fix_compile_args(self, output_dir, macros, include_dirs):
             raise TypeError("'macros' (if supplied) must be a list of tuples")
 
         if include_dirs is None:
-            include_dirs = self.include_dirs
+            include_dirs = list(self.include_dirs)
         elif isinstance(include_dirs, (list, tuple)):
             include_dirs = list(include_dirs) + (self.include_dirs or [])
         else:

distutils/tests/test_ccompiler.py

@@ -76,3 +76,17 @@ def test_has_function_prototype():
         assert not compiler.has_function(
             'setuptools_does_not_exist', includes=['<stdio.h>']
         )
+
+
+def test_include_dirs_after_multiple_compile_calls(c_file):
+    """
+    Calling compile multiple times should not change the include dirs
+    (regression test for setuptools issue #3591).
+    """
+    compiler = ccompiler.new_compiler()
+    python = sysconfig.get_paths()['include']
+    compiler.set_include_dirs([python])
+    compiler.compile(_make_strs([c_file]))
+    assert compiler.include_dirs == [python]
+    compiler.compile(_make_strs([c_file]))
+    assert compiler.include_dirs == [python]