Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distutils/compilers/C/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ def library_dir_option(self, dir: str) -> str:
"""
raise NotImplementedError

def runtime_library_dir_option(self, dir: str) -> str:
def runtime_library_dir_option(self, dir: str) -> str | list[str]:
"""Return the compiler option to add 'dir' to the list of
directories searched for runtime libraries.
"""
Expand Down
2 changes: 1 addition & 1 deletion distutils/compilers/C/unix.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def _is_gcc(self):
compiler = os.path.basename(shlex.split(cc_var)[0])
return "gcc" in compiler or "g++" in compiler

def runtime_library_dir_option(self, dir: str) -> str | list[str]: # type: ignore[override] # Fixed in pypa/distutils#339
def runtime_library_dir_option(self, dir: str) -> str | list[str]:
# XXX Hackish, at the very least. See Python bug #445902:
# https://bugs.python.org/issue445902
# Linkers on different platforms need different options to
Expand Down
1 change: 1 addition & 0 deletions newsfragments/4902.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reverted distutils changes that broke the monkey patching of command classes.
Loading