linker-detection-hack.patch

file_868516.txt (text/plain), 1.44 KB, created by Sam James on 2022-09-05 00:29:09 UTC

diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py
index 684328b4c..eb915a9f7 100644
--- a/mesonbuild/linkers/detect.py
+++ b/mesonbuild/linkers/detect.py
@@ -187,7 +187,8 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
 
         linker = LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
     # first might be apple clang, second is for real gcc, the third is icc
-    elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option:' in e:
+    # forth is a hack for Gentoo Prefix on macOS
+    elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option:' in e or 'binutils-apple' in e:
         if isinstance(comp_class.LINKER_PREFIX, str):
             cmd = compiler + [comp_class.LINKER_PREFIX + '-v'] + extra_args
         else:
diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py
index 9080444..0d686fe 100644
--- a/mesonbuild/linkers/detect.py
+++ b/mesonbuild/linkers/detect.py
@@ -201,7 +201,7 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
         mlog.debug(f'linker stderr:\n{newerr}')

         for line in newerr.split('\n'):
-            if 'PROJECT:ld' in line:
+            if 'PROJECT:ld' in line or 'binutils-apple' in line:
                 v = line.split('-')[1]
                 break
         else: