Skip to content

Commit e651e53

Browse files
authored
Merge pull request #207 from dalcinl/main
[BUG] Fix accumulating flags after compile/link Fixes pypa/setuptools@3591.
2 parents dcd70ba + e649e93 commit e651e53

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

distutils/ccompiler.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def _fix_compile_args(self, output_dir, macros, include_dirs):
383383
raise TypeError("'output_dir' must be a string or None")
384384

385385
if macros is None:
386-
macros = self.macros
386+
macros = list(self.macros)
387387
elif isinstance(macros, list):
388388
macros = macros + (self.macros or [])
389389
else:
@@ -442,14 +442,14 @@ def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
442442
fixed versions of all arguments.
443443
"""
444444
if libraries is None:
445-
libraries = self.libraries
445+
libraries = list(self.libraries)
446446
elif isinstance(libraries, (list, tuple)):
447447
libraries = list(libraries) + (self.libraries or [])
448448
else:
449449
raise TypeError("'libraries' (if supplied) must be a list of strings")
450450

451451
if library_dirs is None:
452-
library_dirs = self.library_dirs
452+
library_dirs = list(self.library_dirs)
453453
elif isinstance(library_dirs, (list, tuple)):
454454
library_dirs = list(library_dirs) + (self.library_dirs or [])
455455
else:
@@ -459,7 +459,7 @@ def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
459459
library_dirs += self.__class__.library_dirs
460460

461461
if runtime_library_dirs is None:
462-
runtime_library_dirs = self.runtime_library_dirs
462+
runtime_library_dirs = list(self.runtime_library_dirs)
463463
elif isinstance(runtime_library_dirs, (list, tuple)):
464464
runtime_library_dirs = list(runtime_library_dirs) + (
465465
self.runtime_library_dirs or []

0 commit comments

Comments
 (0)