Skip to content

Commit 44db5c2

Browse files
committed
update objective_c build hook for arm64e
1 parent 65672f0 commit 44db5c2

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

‎pkgs/objective_c/hook/build.dart‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,11 @@ void main(List<String> args) async {
6565
final sysroot = sdkPath(codeConfig);
6666
final minVersion = minOSVersion(codeConfig);
6767

68-
// TODO(https://github.com/flutter/flutter/issues/186856): Remove this
69-
// workaround and just use -target. Atm this is necessary for AOT testing.
70-
final useArm64e =
71-
testMode && codeConfig.targetArchitecture == Architecture.arm64;
72-
7368
final cFlags = <String>[
7469
'-isysroot',
7570
sysroot,
76-
if (useArm64e) ...['-arch', 'arm64e'] else ...['-target', target],
71+
'-target',
72+
target,
7773
minVersion,
7874
];
7975
final mFlags = [...cFlags, ...objCFlags];
@@ -219,6 +215,7 @@ String toTargetTriple(CodeConfig codeConfig) {
219215

220216
final appleClangMacosTargetFlags = {
221217
Architecture.arm64: 'arm64-apple-darwin',
218+
Architecture.arm64e: 'arm64e-apple-darwin',
222219
Architecture.x64: 'x86_64-apple-darwin',
223220
};
224221

@@ -227,5 +224,9 @@ final appleClangIosTargetFlags = {
227224
IOSSdk.iPhoneOS: 'arm64-apple-ios',
228225
IOSSdk.iPhoneSimulator: 'arm64-apple-ios-simulator',
229226
},
227+
Architecture.arm64e: {
228+
IOSSdk.iPhoneOS: 'arm64e-apple-ios',
229+
IOSSdk.iPhoneSimulator: 'arm64e-apple-ios-simulator',
230+
},
230231
Architecture.x64: {IOSSdk.iPhoneSimulator: 'x86_64-apple-ios-simulator'},
231232
};

0 commit comments

Comments
 (0)