diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index 4772e1a8b52..799560c3963 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -205,7 +205,7 @@ def link_shared_lib (self,
 
         self.link_shared_object (
             objects,
-            self.shared_library_filename (output_libname),
+            self.library_filename (output_libname, lib_type='shared'),
             output_dir,
             libraries,
             library_dirs,
@@ -320,8 +320,10 @@ def library_option (self, lib):
     def find_library_file (self, dirs, lib):
 
         for dir in dirs:
-            shared = os.path.join (dir, self.shared_library_filename (lib))
-            static = os.path.join (dir, self.library_filename (lib))
+            shared = os.path.join (
+                dir, self.library_filename (lib, lib_type='shared'))
+            static = os.path.join (
+                dir, self.library_filename (lib, lib_type='static'))
 
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm