Skip to content

Commit

Permalink
On mac arm64 always use /usr/bin/arch -arm4 to launch clt
Browse files Browse the repository at this point in the history
  • Loading branch information
Kirill.Ponimash authored and ww898 committed Sep 26, 2024
1 parent efb9428 commit bf1e7eb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions JetBrains.Profiler.SelfApi/src/Impl/ConsoleProfiler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ public ConsoleProfiler(string executable, string arguments, string messageServic

// Note(ww898): We force the OS architecture everywhere!!! Process architecture is inherited by default in macOS ARM64. We turn off this behavior for x64 processes with /usr/bin/arch!!!
var isX64ProcessUnderMacOsArm64 = HabitatInfo.Platform == JetPlatform.MacOsX &&
HabitatInfo.OSArchitecture == JetArchitecture.Arm64 &&
HabitatInfo.ProcessArchitecture == JetArchitecture.X64;
HabitatInfo.OSArchitecture == JetArchitecture.Arm64;
var effectiveExecutable = isX64ProcessUnderMacOsArm64 ? "/usr/bin/arch" : executable;
var effectiveArguments = isX64ProcessUnderMacOsArm64 ? $"-arm64 \"{executable}\" {arguments}" : arguments;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Supported frameworks:
<PackageProjectUrl>https://github.com/JetBrains/profiler-self-api/blob/master/README.md</PackageProjectUrl>
<PackageIcon>icon.png</PackageIcon>
<PackageTags>jetbrains profiler profiling memory performance net dotnet netcore dotnetcore netstandard windows uwp macos mac linux musl glibc x86 x64 arm64 x86-64 x86_64 aarch64</PackageTags>
<Version>2.5.11</Version>
<Version>2.5.12-preview1</Version>
</PropertyGroup>
<ItemGroup>
<None Include="../../icon.png" Pack="true" Visible="false" PackagePath="" />
Expand Down

0 comments on commit bf1e7eb

Please sign in to comment.