Use x64 protoc on macOS arm64 (#26080)

pull/26187/head
Brad Barnich 4 years ago committed by GitHub
parent 7125bbe5a5
commit 9807b0363d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      src/csharp/Grpc.Tools.Tests/ProtoToolsPlatformTaskTest.cs
  2. 7
      src/csharp/Grpc.Tools/ProtoToolsPlatform.cs

@ -73,7 +73,16 @@ namespace Grpc.Tools.Tests
if (RuntimeInformation.OSArchitecture == Architecture.Arm64)
{
_cpuMatched++;
Assert.AreEqual("arm64", _task.Cpu);
// On macosx arm64, x64 is used until a native protoc is shipped
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
Assert.AreEqual("x64", _task.Cpu);
}
else
{
Assert.AreEqual("arm64", _task.Cpu);
}
}
}

@ -59,6 +59,13 @@ namespace Grpc.Tools
case CommonPlatformDetection.CpuArchitecture.Arm64: Cpu = "arm64"; break;
default: Cpu = ""; break;
}
// Use x64 on macosx arm64 until a native protoc is shipped
if (Os == "macosx" && Cpu == "arm64")
{
Cpu = "x64";
}
return true;
}
};

Loading…
Cancel
Save