Skip to content

Commit

Permalink
Do not force anymore on mac ARM to launch simulator as Intel process
Browse files Browse the repository at this point in the history
  • Loading branch information
e-marchand committed Sep 13, 2024
1 parent 75839a1 commit f1a774a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
1 change: 0 additions & 1 deletion Project/Sources/Methods/FEATURE_FLAGS.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 5 additions & 8 deletions Project/Sources/Methods/Xcode.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f1a774a

Please sign in to comment.