Improve support for iOS targets.

Author: freakboy3742

mesonbuild/compilers/detect.py

@@ -1123,7 +1123,7 @@ def detect_rust_compiler(env: 'Environment', for_machine: MachineChoice) -> Rust
                 else:
                     linker = type(cc.linker)(compiler, for_machine, cc.LINKER_PREFIX,
                                              always_args=always_args, version=cc.linker.version,
-                                             **extra_args)
+                                             **extra_args)                                          # type: ignore
             elif 'link' in override[0]:
                 linker = guess_win_linker(env,
                                           override, cls, version, for_machine, use_linker_prefix=False)

mesonbuild/envconfig.py

@@ -320,9 +320,9 @@ def is_linux(self) -> bool:
 
     def is_darwin(self) -> bool:
         """
-        Machine is Darwin (iOS/tvOS/OS X)?
+        Machine is a Darwin kernel (macOS/iOS/tvOS/watchOS)?
         """
-        return self.system in {'darwin', 'ios', 'tvos'}
+        return self.system in {'darwin', 'ios', 'tvos', 'watchos'}
 
     def is_android(self) -> bool:
         """

mesonbuild/environment.py

@@ -487,6 +487,9 @@ def detect_cpu(compilers: CompilersDict) -> str:
                                         'linux': 'linux',
                                         'cygwin': 'nt',
                                         'darwin': 'xnu',
+                                        'ios': 'xnu',
+                                        'tvos': 'xnu',
+                                        'watchos': 'xnu',
                                         'dragonfly': 'dragonfly',
                                         'haiku': 'haiku',
                                         'gnu': 'gnu',

mesonbuild/linkers/detect.py

@@ -222,7 +222,10 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
     elif 'xtools-' in o.split('\n', maxsplit=1)[0]:
         xtools = o.split(' ', maxsplit=1)[0]
         v = xtools.split('-', maxsplit=2)[1]
-        linker = linkers.AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+        linker = linkers.AppleDynamicLinker(
+            compiler, for_machine, comp_class.LINKER_PREFIX, override,
+            system=env.machines[for_machine].system, version=v
+        )
     # detect linker on MacOS - must be after other platforms because the
     # "(use -v to see invocation)" will match clang on other platforms,
     # but the rest of the checks will fail and call __failed_to_detect_linker.
@@ -241,7 +244,10 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
                 break
         else:
             __failed_to_detect_linker(compiler, check_args, o, e)
-        linker = linkers.AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+        linker = linkers.AppleDynamicLinker(
+            compiler, for_machine, comp_class.LINKER_PREFIX, override,
+            system=env.machines[for_machine].system, version=v
+        )
     else:
         __failed_to_detect_linker(compiler, check_args, o, e)
     return linker

mesonbuild/linkers/linkers.py

@@ -138,9 +138,11 @@ def _apply_prefix(self, arg: T.Union[str, T.List[str]]) -> T.List[str]:
 
     def __init__(self, exelist: T.List[str],
                  for_machine: mesonlib.MachineChoice, prefix_arg: T.Union[str, T.List[str]],
-                 always_args: T.List[str], *, version: str = 'unknown version'):
+                 always_args: T.List[str], *, system: str = 'unknown system',
+                 version: str = 'unknown version'):
         self.exelist = exelist
         self.for_machine = for_machine
+        self.system = system
         self.version = version
         self.prefix_arg = prefix_arg
         self.always_args = always_args
@@ -803,10 +805,18 @@ def get_asneeded_args(self) -> T.List[str]:
         return self._apply_prefix('-dead_strip_dylibs')
 
     def get_allow_undefined_args(self) -> T.List[str]:
-        return self._apply_prefix('-undefined,dynamic_lookup')
+        # iOS doesn't allow undefined symbols when linking
+        if self.system == 'ios':
+            return []
+        else:
+            return self._apply_prefix('-undefined,dynamic_lookup')
 
     def get_std_shared_module_args(self, target: 'BuildTarget') -> T.List[str]:
-        return ['-dynamiclib'] + self._apply_prefix('-undefined,dynamic_lookup')
+        # iOS requires modules to be linked as dynamic libraries.
+        if self.system == 'ios':
+            return ["-dynamiclib"]
+        else:
+            return ['-bundle'] + self._apply_prefix('-undefined,dynamic_lookup')
 
     def get_pie_args(self) -> T.List[str]:
         return []

mesonbuild/utils/universal.py

@@ -119,6 +119,7 @@ class _VerPickleLoadable(Protocol):
     'is_freebsd',
     'is_haiku',
     'is_hurd',
+    'is_ios',
     'is_irix',
     'is_linux',
     'is_netbsd',
@@ -127,6 +128,8 @@ class _VerPickleLoadable(Protocol):
     'is_parent_path',
     'is_qnx',
     'is_sunos',
+    'is_tvos',
+    'is_watchos',
     'is_windows',
     'is_wsl',
     'iter_regexin_iter',
@@ -625,6 +628,18 @@ def is_osx() -> bool:
     return platform.system().lower() == 'darwin'
 
 
+def is_ios() -> bool:
+    return platform.system().lower() == 'ios'
+
+
+def is_tvos() -> bool:
+    return platform.system().lower() == 'tvos'
+
+
+def is_watchos() -> bool:
+    return platform.system().lower() == 'watchos'
+
+
 def is_linux() -> bool:
     return platform.system().lower() == 'linux'