From 6d7e17e60c8b51d4512f91635760b0b90e58ca64 Mon Sep 17 00:00:00 2001
From: Pavel Kargashinsky <pavel.kargashinsky@jetbrains.com>
Date: Tue, 28 Feb 2023 12:32:25 +0100
Subject: [PATCH] [Gradle][Tests] Remove unnecessary arch -x86_64 usage for arm
 Mac

---
 .../kotlin/gradle/native/CocoaPodsIT.kt       | 21 +------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
index 8ae57ec91c2..fa0dcf40316 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt
@@ -1727,7 +1727,6 @@ class CocoaPodsIT : BaseGradleIT() {
                         runCommand(
                             this, "xcodebuild",
                             "-sdk", "iphonesimulator",
-                            "-arch", "x86_64",
                             "-configuration", "Release",
                             "-workspace", "$name.xcworkspace",
                             "-scheme", name,
@@ -1889,20 +1888,6 @@ class CocoaPodsIT : BaseGradleIT() {
                 if (cocoapodsInstallationAllowed) {
                     println("Installing CocoaPods...")
                     gem("install", "--install-dir", cocoapodsInstallationRoot.absolutePath, "cocoapods")
-                    if (hostIsArmMac) {
-                        // Force running CocoaPods via `arch -x86_64` on ARM MacOS to workaround problems with libffi.
-                        // https://stackoverflow.com/questions/64901180/running-cocoapods-on-apple-silicon-m1
-                        cocoapodsBinPath.mkdirs()
-                        val wrapper = cocoapodsBinPath.resolve("pod")
-                        wrapper.writeText(
-                            """
-                                #!/bin/bash
-                                arch -x86_64 "${cocoapodsInstallationRoot.absolutePath}/bin/pod" ${'$'}@
-                            """.trimIndent()
-                        )
-                        wrapper.setExecutable(true)
-                    }
-
                 } else {
                     fail(
                         """
@@ -1957,11 +1942,7 @@ class CocoaPodsIT : BaseGradleIT() {
         private fun gem(vararg args: String): String {
             // On ARM MacOS, run gem using arch -x86_64 to workaround problems with libffi.
             // https://stackoverflow.com/questions/64901180/running-cocoapods-on-apple-silicon-m1
-            val command = if (hostIsArmMac) {
-                listOf("arch", "-x86_64", "gem", *args)
-            } else {
-                listOf("gem", *args)
-            }
+            val command = listOf("gem", *args)
             println("Run command: ${command.joinToString(separator = " ")}")
             val result = runProcess(command, File("."), options = BuildOptions(forceOutputToStdout = true))
             check(result.isSuccessful) {