Use architecture-agnostic RID for ANGLE OSX builds

Perksey · web-flow · commit 21caa3153e9c · 2024-10-05T15:16:02.000+01:00
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())

Original file line number	Diff line number	Diff line change
`@@ -101,25 +101,21 @@ partial class Build {`
`101`	`101`	`// create universal mac binaries`
`102`	`102`	`var arm64NativeRuntimes = runtimes / "osx-arm64" / "native";`
`103`	`103`	`var x64NativeRuntimes = runtimes / "osx-x64" / "native";`
	`104`	`+ var universalNativeRuntimes = runtimes / "osx" / "native";`
`104`	`105`	`EnsureCleanDirectory(arm64NativeRuntimes);`
`105`	`106`	`EnsureCleanDirectory(x64NativeRuntimes);`
	`107`	`+ EnsureCleanDirectory(universalNativeRuntimes);`
`106`	`108`	`foreach (var lib in new[] { "libGLESv2.dylib", "libEGL.dylib" })`
`107`	`109`	`{`
`108`	`110`	`var x64Lib = angleSourceDir / "out" / "Release_x64" / lib;`
`109`	`111`	`var arm64Lib = angleSourceDir / "out" / "Release_arm64" / lib;`
`110`	`112`	`InheritedShell`
`111`	`113`	`(`
`112`		`- $"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{arm64NativeRuntimes / lib}\"",`
	`114`	`+ $"lipo -create \"{arm64Lib}\" \"{x64Lib}\" -output \"{universalNativeRuntimes / lib}\"",`
`113`	`115`	`angleSourceDir`
`114`	`116`	`)`
`115`	`117`	`.AssertZeroExitCode();`
`116`	`118`	`}`
`117`		`-`
`118`		`- CopyAll`
`119`		`- (`
`120`		`- arm64NativeRuntimes.GlobFiles("libGLESv2.dll", "libEGL.dll", "libANGLE.dll"),`
`121`		`- x64NativeRuntimes`
`122`		`- );`
`123`	`119`	`}`
`124`	`120`	`// else`
`125`	`121`	`// if (OperatingSystem.IsLinux())`