From 576e19e809b9edd5e067d62c4afb4aaf3131db43 Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@amazon.com>
Date: Sat, 30 Mar 2024 21:34:06 -0400
Subject: [PATCH] Remove customizations for macOS on Apple Silicon

These tweaks used to be needed to work around [a Gradle
bug](https://github.com/gradle/gradle/issues/18876).  That bug is still
open, but I find that all native components build and pass their tests
just fine without these hacks.
---
 build.gradle.kts                  | 1 -
 cast/cast/build.gradle.kts        | 7 -------
 cast/smoke_main/build.gradle.kts  | 7 -------
 cast/xlator_test/build.gradle.kts | 6 ------
 4 files changed, 21 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2d03695e5f..b3fd4fb46c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,7 +28,6 @@ repositories {
 }
 
 val osName: String by extra(System.getProperty("os.name"))
-val archName: String by extra(System.getProperty("os.arch"))
 val isWindows by extra(osName.startsWith("Windows "))
 
 JavaVersion.current().let {
diff --git a/cast/cast/build.gradle.kts b/cast/cast/build.gradle.kts
index bad299621e..eacfa387ff 100644
--- a/cast/cast/build.gradle.kts
+++ b/cast/cast/build.gradle.kts
@@ -8,13 +8,6 @@ plugins {
 }
 
 library {
-  // Temporary change to build on M1 Mac machines, until
-  // https://github.com/gradle/gradle/issues/18876
-  // is fixed
-  if (rootProject.extra["osName"] == "Mac OS X" && rootProject.extra["archName"] == "aarch64") {
-    targetMachines.add(machines.macOS.x86_64)
-  }
-
   binaries.whenElementFinalized {
     compileTask.get().configure(closureOf<CppCompile> { macros["BUILD_CAST_DLL"] = "1" })
 
diff --git a/cast/smoke_main/build.gradle.kts b/cast/smoke_main/build.gradle.kts
index 7eea263c95..880a2dcc56 100644
--- a/cast/smoke_main/build.gradle.kts
+++ b/cast/smoke_main/build.gradle.kts
@@ -47,13 +47,6 @@ val xlatorTestDebugSharedLibraryConfig = createXlatorConfig(false)
 val xlatorTestReleaseSharedLibraryConfig = createXlatorConfig(true)
 
 application {
-  // Temporary change to build on M1 Mac machines, until
-  // https://github.com/gradle/gradle/issues/18876
-  // is fixed
-  if (rootProject.extra["osName"] == "Mac OS X" && rootProject.extra["archName"] == "aarch64") {
-    targetMachines.add(machines.macOS.x86_64)
-  }
-
   dependencies {
     coreResources(projects.core)
     smokeMainExtraPathElements(projects.cast)
diff --git a/cast/xlator_test/build.gradle.kts b/cast/xlator_test/build.gradle.kts
index a5a142e851..8b46f8fbbe 100644
--- a/cast/xlator_test/build.gradle.kts
+++ b/cast/xlator_test/build.gradle.kts
@@ -13,12 +13,6 @@ dependencies {
 }
 
 library {
-  // Temporary change to build on M1 Mac machines, until
-  // https://github.com/gradle/gradle/issues/18876
-  // is fixed
-  if (rootProject.extra["osName"] == "Mac OS X" && rootProject.extra["archName"] == "aarch64") {
-    targetMachines.add(machines.macOS.x86_64)
-  }
   privateHeaders.from(castHeaderDirectory)
 
   dependencies { implementation(projects.cast.cast) }