Use architecture-agnostic RID for ANGLE OSX builds

dotnet · Oct 5, 2024 · 21caa31 · 21caa31
1 parent 1c08ac5
commit 21caa31
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/build/nuke/Native/Angle.cs b/build/nuke/Native/Angle.cs
@@ -101,25 +101,21 @@ partial class Build {
                         // create universal mac binaries
                         var arm64NativeRuntimes = runtimes / "osx-arm64" / "native";
                         var x64NativeRuntimes = runtimes / "osx-x64" / "native";
+                        var universalNativeRuntimes = runtimes / "osx" / "native";
                         EnsureCleanDirectory(arm64NativeRuntimes);
                         EnsureCleanDirectory(x64NativeRuntimes);
+                        EnsureCleanDirectory(universalNativeRuntimes);
                         foreach (var lib in new[] { "libGLESv2.dylib", "libEGL.dylib" })
                         {
                             var x64Lib = angleSourceDir / "out" / "Release_x64" / lib;
                             var arm64Lib = angleSourceDir / "out" / "Release_arm64" / lib;
                             InheritedShell
                                 (
-                                    $"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{arm64NativeRuntimes / lib}\"",
+                                    $"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{universalNativeRuntimes / lib}\"",
                                     angleSourceDir
                                 )
                                 .AssertZeroExitCode();
                         }
-                        
-                        CopyAll
-                        (
-                            arm64NativeRuntimes.GlobFiles("libGLESv2.dll", "libEGL.dll", "libANGLE.dll"),
-                            x64NativeRuntimes
-                        );
                     }
                     // else
                     //     if (OperatingSystem.IsLinux())