Skip to content

Commit

Permalink
Remove customizations for macOS on Apple Silicon
Browse files Browse the repository at this point in the history
These tweaks used to be needed to work around [a Gradle
bug](gradle/gradle#18876).  That bug is still
open, but I find that all native components build and pass their tests
just fine without these hacks.
  • Loading branch information
liblit-at-amazon committed Mar 31, 2024
1 parent 00e4c16 commit 576e19e
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 21 deletions.
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 0 additions & 7 deletions cast/cast/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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" })

Expand Down
7 changes: 0 additions & 7 deletions cast/smoke_main/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions cast/xlator_test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down

0 comments on commit 576e19e

Please sign in to comment.