From f1a774ae0ca38f945242e0348d2a89e36c6d58e5 Mon Sep 17 00:00:00 2001 From: "eric.marchand" Date: Fri, 13 Sep 2024 14:28:49 +0200 Subject: [PATCH] Do not force anymore on mac ARM to launch simulator as Intel process --- Project/Sources/Methods/FEATURE_FLAGS.4dm | 1 - Project/Sources/Methods/Xcode.4dm | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Project/Sources/Methods/FEATURE_FLAGS.4dm b/Project/Sources/Methods/FEATURE_FLAGS.4dm index c5527943..33d54c5b 100644 --- a/Project/Sources/Methods/FEATURE_FLAGS.4dm +++ b/Project/Sources/Methods/FEATURE_FLAGS.4dm @@ -136,7 +136,6 @@ Feature.main("listEditor") // #130828 [MOBILE] Create and edit an input control // Mark:-🚧 WIP // Feature.wip("buildWithCmd") // Allow to create/build using cmd only: azure:3628 -// Feature.wip("simuARMOnAppleProcessor") // Mac M1 build for simu using arm64 // Feature.wip("duplicateTemplate") // Allow to duplicate template in host database and show on disk https:// Project.4d.com/issues/98054 // Feature.wip("newFormatterChoiceList") // Menu to create formatter choice list directly , from data Feature.wip("taskIndicator") // UI for background tasks executing diff --git a/Project/Sources/Methods/Xcode.4dm b/Project/Sources/Methods/Xcode.4dm index 7a73d3ff..960bde10 100644 --- a/Project/Sources/Methods/Xcode.4dm +++ b/Project/Sources/Methods/Xcode.4dm @@ -868,14 +868,11 @@ Case of $Txt_cmd:=$Txt_cmd+" -sdk "+$Obj_param.sdk If (Position:C15("simulator"; $Obj_param.sdk)>0) -/* -WARNING: -Get system info should not be called frequently (consumer) as the processor will not change during the execution of the code -*/ - If (Feature.with("simuARMOnAppleProcessor") && (Get system info:C1571().processor="@Apple@")) - $Txt_cmd:=$Txt_cmd+" -arch arm64" // TODO APPLE SILICON: according to if silicon or not set good arch for simu - Else - $Txt_cmd:=$Txt_cmd+" -arch x86_64" // TODO APPLE SILICON: according to if silicon or not set good arch for simu + + If (Feature.with("isForceIntelSimulator") && (Get system info:C1571().processor="@Apple@")) + + $Txt_cmd:=$Txt_cmd+" -arch x86_64" // not more needed with xcframework (XXX: maybe add it if old framework?) + End if End if