From cb4b7e545bc8f9b9faa602b18adb38211974dd12 Mon Sep 17 00:00:00 2001 From: Daco Harkes Date: Tue, 30 May 2023 12:23:25 +0200 Subject: [PATCH] [c_compiler] Target ios_x64 --- pkgs/c_compiler/lib/src/cbuilder/run_cbuilder.dart | 1 + pkgs/c_compiler/test/cbuilder/cbuilder_cross_ios_test.dart | 5 +++++ pkgs/native_assets_cli/lib/src/model/target.dart | 1 + 3 files changed, 7 insertions(+) diff --git a/pkgs/c_compiler/lib/src/cbuilder/run_cbuilder.dart b/pkgs/c_compiler/lib/src/cbuilder/run_cbuilder.dart index 9a8945909b..3fe0725e26 100644 --- a/pkgs/c_compiler/lib/src/cbuilder/run_cbuilder.dart +++ b/pkgs/c_compiler/lib/src/cbuilder/run_cbuilder.dart @@ -208,6 +208,7 @@ class RunCBuilder { static const appleClangTargetFlags = { Target.iOSArm64: 'arm64-apple-ios', + Target.iOSX64: 'x86_64-apple-ios', Target.macOSArm64: 'arm64-apple-darwin', Target.macOSX64: 'x86_64-apple-darwin', }; diff --git a/pkgs/c_compiler/test/cbuilder/cbuilder_cross_ios_test.dart b/pkgs/c_compiler/test/cbuilder/cbuilder_cross_ios_test.dart index bbcb70d394..415740e364 100644 --- a/pkgs/c_compiler/test/cbuilder/cbuilder_cross_ios_test.dart +++ b/pkgs/c_compiler/test/cbuilder/cbuilder_cross_ios_test.dart @@ -25,16 +25,21 @@ void main() { const targets = [ Target.iOSArm64, + Target.iOSX64, ]; // Dont include 'mach-o' or 'Mach-O', different spelling is used. const objdumpFileFormat = { Target.iOSArm64: 'arm64', + Target.iOSX64: '64-bit x86-64', }; for (final linkMode in LinkMode.values) { for (final targetIOSSdk in IOSSdk.values) { for (final target in targets) { + if (target == Target.iOSX64 && targetIOSSdk == IOSSdk.iPhoneOs) { + continue; + } test('Cbuilder $linkMode library $targetIOSSdk $target', () async { await inTempDir((tempUri) async { final addCUri = diff --git a/pkgs/native_assets_cli/lib/src/model/target.dart b/pkgs/native_assets_cli/lib/src/model/target.dart index 4d5ea3ceef..c570d0e291 100644 --- a/pkgs/native_assets_cli/lib/src/model/target.dart +++ b/pkgs/native_assets_cli/lib/src/model/target.dart @@ -249,6 +249,7 @@ class Target implements Comparable { fuchsiaX64, iOSArm, iOSArm64, + iOSX64, linuxArm, linuxArm64, linuxIA32,