[native_toolchain_c] Add linking for iOS (#2363)

Author: goderbauer

pkgs/native_toolchain_c/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.16.5
+
+* Support linking for iOS.
+
 ## 0.16.4
 
 * Support linking for MacOS.

pkgs/native_toolchain_c/lib/src/cbuilder/clinker.dart

@@ -53,7 +53,7 @@ class CLinker extends CTool implements Linker {
     required LinkOutputBuilder output,
     required Logger? logger,
   }) async {
-    const supportedTargetOSs = [OS.linux, OS.android, OS.macOS];
+    const supportedTargetOSs = [OS.linux, OS.android, OS.macOS, OS.iOS];
     if (!supportedTargetOSs.contains(input.config.code.targetOS)) {
       throw UnsupportedError(
         'This feature is only supported when targeting '

pkgs/native_toolchain_c/lib/src/cbuilder/linker_options.dart

@@ -98,7 +98,7 @@ extension LinkerOptionsExt on LinkerOptions {
     final includeAllSymbols = _symbolsToKeep == null;
 
     switch (targetOS) {
-      case OS.macOS:
+      case OS.macOS || OS.iOS:
         return [
           if (!includeAllSymbols) ...sourceFiles,
           ..._toLinkerSyntax(tool, [

pkgs/native_toolchain_c/pubspec.yaml

@@ -1,7 +1,7 @@
 name: native_toolchain_c
 description: >-
   A library to invoke the native C compiler installed on the host machine.
-version: 0.16.4
+version: 0.16.5
 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c
 
 topics:

pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart

@@ -16,9 +16,6 @@ import 'package:test/test.dart';
 
 import '../helpers.dart';
 
-const flutteriOSHighestBestEffort = 16;
-const flutteriOSHighestSupported = 17;
-
 void main() {
   if (!Platform.isMacOS) {
     // Avoid needing status files on Dart SDK CI.
@@ -27,12 +24,6 @@ void main() {
 
   const targets = [Architecture.arm64, Architecture.x64];
 
-  // Dont include 'mach-o' or 'Mach-O', different spelling is used.
-  const objdumpFileFormat = {
-    Architecture.arm64: 'arm64',
-    Architecture.x64: '64-bit x86-64',
-  };
-
   const name = 'add';
 
   const optimizationLevels = OptimizationLevel.values;
@@ -124,7 +115,7 @@ void main() {
                 final machine = objdumpResult.stdout
                     .split('\n')
                     .firstWhere((e) => e.contains('file format'));
-                expect(machine, contains(objdumpFileFormat[target]));
+                expect(machine, contains(objdumpFileFormatIOS[target]));
 
                 final otoolResult = await runProcess(
                   executable: Uri.file('otool'),

pkgs/native_toolchain_c/test/clinker/build_testfiles.dart

@@ -17,13 +17,19 @@ Future<Uri> buildTestArchive(
   Architecture architecture, {
   int? androidTargetNdkApi, // Must be specified iff targetOS is OS.android.
   int? macOSTargetVersion, // Must be specified iff targetOS is OS.macos.
+  int? iOSTargetVersion, // Must be specified iff targetOS is OS.iOS.
+  IOSSdk? iOSTargetSdk, // Must be specified iff targetOS is OS.iOS.
 }) async {
   if (targetOS == OS.android) {
     ArgumentError.checkNotNull(androidTargetNdkApi, 'androidTargetNdkApi');
   }
   if (targetOS == OS.macOS) {
     ArgumentError.checkNotNull(macOSTargetVersion, 'macOSTargetVersion');
   }
+  if (targetOS == OS.iOS) {
+    ArgumentError.checkNotNull(iOSTargetVersion, 'iOSTargetVersion');
+    ArgumentError.checkNotNull(iOSTargetSdk, 'iOSTargetSdk');
+  }
 
   final test1Uri = packageUri.resolve('test/clinker/testfiles/linker/test1.c');
   final test2Uri = packageUri.resolve('test/clinker/testfiles/linker/test2.c');
@@ -56,6 +62,12 @@ Future<Uri> buildTestArchive(
         macOS: macOSTargetVersion != null
             ? MacOSCodeConfig(targetVersion: macOSTargetVersion)
             : null,
+        iOS: iOSTargetVersion != null && iOSTargetSdk != null
+            ? IOSCodeConfig(
+                targetSdk: iOSTargetSdk,
+                targetVersion: iOSTargetVersion,
+              )
+            : null,
       ),
     );
 

pkgs/native_toolchain_c/test/clinker/objects_cross_android_test.dart

@@ -16,7 +16,7 @@ void main() {
     flutterAndroidNdkVersionLowestSupported,
     flutterAndroidNdkVersionHighestSupported,
   ]) {
-    group('Android API$apiLevel', () {
+    group('Android API$apiLevel:', () {
       runObjectsTests(targetOS, architectures, androidTargetNdkApi: apiLevel);
     });
   }

pkgs/native_toolchain_c/test/clinker/objects_cross_ios_test.dart

@@ -0,0 +1,39 @@
+// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+@TestOn('mac-os')
+library;
+
+import 'dart:io';
+
+import 'package:code_assets/code_assets.dart';
+import 'package:test/test.dart';
+
+import '../helpers.dart';
+import 'objects_helper.dart';
+
+void main() {
+  if (!Platform.isMacOS) {
+    // Avoid needing status files on Dart SDK CI.
+    return;
+  }
+
+  const targetOS = OS.iOS;
+
+  for (final iOSVersion in [
+    flutteriOSHighestBestEffort,
+    flutteriOSHighestSupported,
+  ]) {
+    for (final iOSTargetSdk in IOSSdk.values) {
+      group('$iOSTargetSdk $iOSVersion:', () {
+        runObjectsTests(
+          targetOS,
+          iOSSupportedArchitecturesFor(iOSTargetSdk),
+          iOSTargetVersion: iOSVersion,
+          iOSTargetSdk: iOSTargetSdk,
+        );
+      });
+    }
+  }
+}

pkgs/native_toolchain_c/test/clinker/objects_helper.dart

@@ -17,13 +17,19 @@ void runObjectsTests(
   List<Architecture> architectures, {
   int? androidTargetNdkApi, // Must be specified iff targetOS is OS.android.
   int? macOSTargetVersion, // Must be specified iff targetOS is OS.macos.
+  int? iOSTargetVersion, // Must be specified iff targetOS is OS.iOS.
+  IOSSdk? iOSTargetSdk, // Must be specified iff targetOS is OS.iOS.
 }) {
   if (targetOS == OS.android) {
     ArgumentError.checkNotNull(androidTargetNdkApi, 'androidTargetNdkApi');
   }
   if (targetOS == OS.macOS) {
     ArgumentError.checkNotNull(macOSTargetVersion, 'macOSTargetVersion');
   }
+  if (targetOS == OS.iOS) {
+    ArgumentError.checkNotNull(iOSTargetVersion, 'iOSTargetVersion');
+    ArgumentError.checkNotNull(iOSTargetSdk, 'iOSTargetSdk');
+  }
 
   const name = 'mylibname';
 
@@ -39,6 +45,8 @@ void runObjectsTests(
         architecture,
         androidTargetNdkApi: androidTargetNdkApi,
         macOSTargetVersion: macOSTargetVersion,
+        iOSTargetVersion: iOSTargetVersion,
+        iOSTargetSdk: iOSTargetSdk,
       );
 
       final linkInputBuilder = LinkInputBuilder()
@@ -61,6 +69,12 @@ void runObjectsTests(
             macOS: macOSTargetVersion != null
                 ? MacOSCodeConfig(targetVersion: macOSTargetVersion)
                 : null,
+            iOS: iOSTargetVersion != null && iOSTargetSdk != null
+                ? IOSCodeConfig(
+                    targetSdk: iOSTargetSdk,
+                    targetVersion: iOSTargetVersion,
+                  )
+                : null,
           ),
         );
 

pkgs/native_toolchain_c/test/clinker/throws_test.dart

@@ -13,7 +13,8 @@ void main() {
   for (final targetOS in OS.values) {
     if (targetOS == OS.linux ||
         targetOS == OS.android ||
-        targetOS == OS.macOS) {
+        targetOS == OS.macOS ||
+        targetOS == OS.iOS) {
       // Is implemented.
       continue;
     }