Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make anycpu work correctly on Arm64 #15234

Merged
merged 6 commits into from
May 23, 2023
Merged

Make anycpu work correctly on Arm64 #15234

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
226a9bf
Makeanuycpu work correctly on arm64
KevinRansom May 18, 2023
2e5d482
Update Microsoft.FSharp.Targets
KevinRansom May 18, 2023
1d44a7a
Merge branch 'main' into preferanycpu
KevinRansom May 18, 2023
591ae6e
Merge branch 'main' into preferanycpu
KevinRansom May 19, 2023
55c0af6
Merge branch 'main' into preferanycpu
KevinRansom May 22, 2023
0e165c8
Merge branch 'main' into preferanycpu
KevinRansom May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/FSharp.Build/Microsoft.FSharp.Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,14 @@ this file.

<PropertyGroup Condition="'$(FSharp_Shim_Present)' == 'true' and '$(FSharpPreferNetFrameworkTools)' == 'true'">

<FSharpPreferAnyCpuTools Condition="'$(FSharpPreferAnyCpuTools)' == '' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'Arm64'">false</FSharpPreferAnyCpuTools>
<FSharpPreferAnyCpuTools Condition="'$(FSharpPreferAnyCpuTools)' == '' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' != 'Arm64'">$(FSharpPrefer64BitTools)</FSharpPreferAnyCpuTools>

<!-- Nothing set so use default, Arm, default to native arm, X64 default to AnyCpu -->
<FSharpPreferAnyCpuTools Condition="'$(FSharpPreferAnyCpuTools)' == '' and '$(FSharpPrefer64BitTools)' == '' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'Arm64'">false</FSharpPreferAnyCpuTools>
<FSharpPreferAnyCpuTools Condition="'$(FSharpPreferAnyCpuTools)' == '' and '$(FSharpPrefer64BitTools)' == '' and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' != 'Arm64'">true</FSharpPreferAnyCpuTools>

<!-- FSharpPreferAnyCpuTools not yet set, use whatever value FSharpPrefer64BitTools is set to -->
<FSharpPreferAnyCpuTools Condition="'$(FSharpPreferAnyCpuTools)' == ''">$(FSharpPrefer64BitTools)</FSharpPreferAnyCpuTools>

<FscToolPath>$(Fsc_NetFramework_ToolPath)</FscToolPath>
<FscToolExe Condition="'$(FSharpPreferAnyCpuTools)' != 'false'">$(Fsc_NetFramework_AnyCpu_ToolExe)</FscToolExe>
<FscToolExe Condition="'$(FSharpPreferAnyCpuTools)' == 'false'">$(Fsc_NetFramework_PlatformSpecific_ToolExe)</FscToolExe>
Expand Down