mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 04:00:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1255 from toad-dev/patch/illuaminate-support-arm-macs

Browse Source 
Deliver x86_64 Illuaminate binaries to all Macs
This commit is contained in:
Jonathan Coates 2022-12-18 00:00:22 +00:00 committed by GitHub
commit 9d394f44d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/cc/tweaked/gradle/Illuaminate.kt
View File

@ -66,9 +66,11 @@ class IlluaminatePlugin : Plugin<Project> {
val osArch = System.getProperty("os.arch").toLowerCase() val osArch = System.getProperty("os.arch").toLowerCase()
val arch = when { val arch = when {
// On macOS the x86_64 binary will work for both ARM and Intel Macs through Rosetta.
os == "macos" -> "x86_64"
osArch == "arm" || osArch.startsWith("aarch") -> error("Unsupported architecture '$osArch' for illuaminate") osArch == "arm" || osArch.startsWith("aarch") -> error("Unsupported architecture '$osArch' for illuaminate")
osArch.contains("64") -> "x86_64" osArch.contains("64") -> "x86_64"
else -> error("Unsupported architecture $osArch for illuaminate") else -> error("Unsupported architecture '$osArch' for illuaminate")
} }
return project.dependencies.create( return project.dependencies.create(