Work around naming of static libs.

Author: Maxwell175

setuptools/_distutils/compilers/C/base.py

@@ -715,6 +715,7 @@ def link(
         extra_postargs: list[str] | None = None,
         build_temp: str | os.PathLike[str] | None = None,
         target_lang: str | None = None,
+        extra_midargs = None,
     ):
         """Link a bunch of stuff together to create an executable or
         shared library file.
@@ -778,6 +779,7 @@ def link_shared_lib(
         build_temp: str | os.PathLike[str] | None = None,
         target_lang: str | None = None,
     ):
+        raise NotImplementedError('Building shared libs is disabled for Nuitka-Python')
         self.link(
             Compiler.SHARED_LIBRARY,
             objects,
@@ -809,6 +811,7 @@ def link_shared_object(
         build_temp: str | os.PathLike[str] | None = None,
         target_lang: str | None = None,
     ):
+        raise NotImplementedError('Building shared libs is disabled for Nuitka-Python')
         self.link(
             Compiler.SHARED_OBJECT,
             objects,
@@ -837,6 +840,7 @@ def link_executable(
         extra_preargs: list[str] | None = None,
         extra_postargs: list[str] | None = None,
         target_lang: str | None = None,
+        extra_midargs = None,
     ):
         self.link(
             Compiler.EXECUTABLE,
@@ -852,6 +856,7 @@ def link_executable(
             extra_postargs,
             None,
             target_lang,
+            extra_midargs,
         )
 
     # -- Miscellaneous methods -----------------------------------------
@@ -1122,6 +1127,9 @@ def library_filename(
         fmt = getattr(self, lib_type + "_lib_format")
         ext = getattr(self, lib_type + "_lib_extension")
 
+        if libname.endswith(ext):
+            ext = ""
+
         dir, base = os.path.split(libname)
         filename = fmt % (base, ext)
         if strip_dir:
@@ -1390,5 +1398,9 @@ def gen_lib_options(
                     f"no library file corresponding to '{lib}' found (skipping)"
                 )
         else:
-            lib_opts.append(compiler.library_option(lib))
+            lib_file = compiler.find_library_file(library_dirs, lib_name)
+            if lib_file is not None and lib_file.endswith('.a'):
+                lib_opts.append(lib_file)
+            else:
+                lib_opts.append(compiler.library_option(lib))
     return lib_opts

setuptools/_distutils/compilers/C/msvc.py

@@ -311,12 +311,12 @@ def initialize(self, plat_name: str | None = None) -> None:
         # bpo-38597: Always compile with dynamic linking
         # Future releases of Python 3.x will include all past
         # versions of vcruntime*.dll for compatibility.
-        self.compile_options = ['/nologo', '/O2', '/W3', '/GL', '/DNDEBUG', '/MD']
+        self.compile_options = ['/nologo', '/O2', '/W3', '/GL', '/DNDEBUG', '/MT']
 
         self.compile_options_debug = [
             '/nologo',
             '/Od',
-            '/MDd',
+            '/MTd',
             '/Zi',
             '/W3',
             '/D_DEBUG',
@@ -476,6 +476,8 @@ def create_static_lib(
         objects, output_dir = self._fix_object_args(objects, output_dir)
         output_filename = self.library_filename(output_libname, output_dir=output_dir)
 
+        os.makedirs(os.path.dirname(output_filename), exist_ok=True)
+
         if self._need_link(objects, output_filename):
             lib_args = objects + ['/OUT:' + output_filename]
             if debug:
@@ -503,6 +505,7 @@ def link(
         extra_postargs: Iterable[str] | None = None,
         build_temp: str | os.PathLike[str] | None = None,
         target_lang: str | None = None,
+        extra_midargs = None,
     ) -> None:
         if not self.initialized:
             self.initialize()
@@ -544,6 +547,8 @@ def link(
 
             if extra_preargs:
                 ld_args[:0] = extra_preargs
+            if extra_midargs:
+                ld_args.extend(extra_midargs)
             if extra_postargs:
                 ld_args.extend(extra_postargs)
 
@@ -598,6 +603,8 @@ def library_option(self, lib):
         return self.library_filename(lib)
 
     def find_library_file(self, dirs, lib, debug=False):
+        if len(dirs) == 1 and os.path.isfile(os.path.join(dirs[0], lib)):
+            return os.path.join(dirs[0], lib)
         # Prefer a debugging library if found (and requested), but deal
         # with it if we don't have one.
         if debug:

setuptools/_distutils/compilers/C/unix.py

@@ -138,6 +138,13 @@ class Compiler(base.Compiler):
     if sys.platform[:6] == "darwin":
         executables['ranlib'] = ["ranlib"]
 
+    # Nuitka: Make sure to use the original settings
+    executables["compiler"] = sysconfig.get_config_var("CC")
+    executables["compiler_so"] = sysconfig.get_config_var("CC")
+    executables["compiler_cxx"] = sysconfig.get_config_var("CXX")
+    executables["linker_so"] = sysconfig.get_config_var("CC")
+    executables["linker_exe"] = sysconfig.get_config_var("CC")
+
     # Needed for the filename generation methods provided by the base
     # class, CCompiler.  NB. whoever instantiates/uses a particular
     # UnixCCompiler instance should set 'shared_lib_ext' -- we set a
@@ -229,6 +236,8 @@ def create_static_lib(
 
         output_filename = self.library_filename(output_libname, output_dir=output_dir)
 
+        os.makedirs(os.path.dirname(output_filename), exist_ok=True)
+
         if self._need_link(objects, output_filename):
             self.mkpath(os.path.dirname(output_filename))
             self.spawn(self.archiver + [output_filename] + objects + self.objects)
@@ -261,6 +270,7 @@ def link(
         extra_postargs=None,
         build_temp=None,
         target_lang=None,
+        extra_midargs=None,
     ):
         objects, output_dir = self._fix_object_args(objects, output_dir)
         fixed_args = self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
@@ -273,11 +283,14 @@ def link(
             output_filename = os.path.join(output_dir, output_filename)
 
         if self._need_link(objects, output_filename):
-            ld_args = objects + self.objects + lib_opts + ['-o', output_filename]
+            ld_args = objects + self.objects
             if debug:
                 ld_args[:0] = ['-g']
+            if extra_midargs:
+                ld_args += extra_midargs
             if extra_preargs:
                 ld_args[:0] = extra_preargs
+            ld_args += lib_opts + ['-o', output_filename]
             if extra_postargs:
                 ld_args.extend(extra_postargs)
             self.mkpath(os.path.dirname(output_filename))
@@ -286,6 +299,8 @@ def link(
                 # building an executable or linker_so (with shared options)
                 # when building a shared library.
                 building_exe = target_desc == base.Compiler.EXECUTABLE
+                if not building_exe:
+                    raise NotImplemented("No shared libs in Nuitka-Python")
                 linker = (
                     self.linker_exe
                     if building_exe
@@ -408,10 +423,10 @@ def find_library_file(self, dirs, lib, debug=False):
         assume that *all* Unix C compilers do,
         ignoring even GCC's "-static" option.
         """
-        lib_names = (
+        lib_names = [lib] + [
             self.library_filename(lib, lib_type=type)
             for type in 'dylib xcode_stub shared static'.split()
-        )
+        ]
 
         roots = map(self._library_root, dirs)
 

setuptools/_distutils/file_util.py

@@ -104,6 +104,10 @@ def copy_file(  # noqa: C901
     from distutils._modified import newer
     from stat import S_IMODE, ST_ATIME, ST_MODE, ST_MTIME
 
+    if not os.path.isfile(src):
+        src = os.path.join(os.path.dirname(src), "lib" + os.path.basename(src))
+    if not os.path.isfile(src):
+        src = os.path.join(os.path.dirname(src), os.path.basename(src) + ".a")
     if not os.path.isfile(src):
         raise DistutilsFileError(
             f"can't copy '{src}': doesn't exist or not a regular file"