ninjabackend: fix linking of non-bundled static libraries on rustc macos

rustc -lstatic+verbatim=filename is not portable, given that linkers may not
support passing unmodified filenames.

If we use -bundle, then also use -verbatim (default) and let the system
linker find the library by adding prefix/suffix itself.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Author: elmarco

mesonbuild/backend/ninjabackend.py

@@ -2048,7 +2048,7 @@ def _link_library(libname: str, static: bool, bundle: bool = False) -> None:
             modifiers = []
             if not bundle and static:
                 modifiers.append('-bundle')
-            if verbatim:
+            elif verbatim:
                 modifiers.append(verbatim)
             if modifiers:
                 type_ += ':' + ','.join(modifiers)
@@ -2094,7 +2094,7 @@ def _link_library(libname: str, static: bool, bundle: bool = False) -> None:
             link_whole = d in target.link_whole_targets
             if isinstance(target, build.StaticLibrary) or (isinstance(target, build.Executable) and rustc.get_crt_static()):
                 static = isinstance(d, build.StaticLibrary)
-                libname = os.path.basename(lib) if verbatim else d.name
+                libname = os.path.basename(lib) if (verbatim and link_whole) else d.name
                 _link_library(libname, static, bundle=link_whole)
             elif link_whole:
                 link_whole_args = rustc.linker.get_link_whole_for([lib])