diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index 617d0d5e06b..702dd4c09f2 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -4221,7 +4221,7 @@ if (PlatformInfo.isAppleTarget(project)) { // Enable ARC optimizations to prevent some objects from leaking in Obj-C code due to exceptions: args '-O2' } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjcsmoke.dylib") } @@ -4247,7 +4247,7 @@ if (PlatformInfo.isAppleTarget(project)) { // Enable ARC optimizations to prevent some objects from leaking in Obj-C code due to exceptions: args '-O2' } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjctests.dylib") } } @@ -4265,7 +4265,7 @@ if (PlatformInfo.isAppleTarget(project)) { args "-lobjc", '-fobjc-arc' args '-fPIC', '-shared', '-o', "$buildDir/libobjcmisc.dylib" } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjcmisc.dylib") } } @@ -4282,7 +4282,7 @@ if (PlatformInfo.isAppleTarget(project)) { args "-lobjc", '-fobjc-arc' args '-fPIC', '-shared', '-o', "$buildDir/libobjcmessaging.dylib" } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjcmessaging.dylib") } } @@ -4300,7 +4300,7 @@ if (PlatformInfo.isAppleTarget(project)) { args "-lobjc", '-fobjc-arc' args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib" } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib") } } @@ -4319,7 +4319,7 @@ if (PlatformInfo.isAppleTarget(project)) { args "-lobjc", '-fobjc-arc' args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib" } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib") } } @@ -4338,7 +4338,7 @@ if (PlatformInfo.isAppleTarget(project)) { args "-lobjc", '-fobjc-arc' args '-fPIC', '-shared', '-o', "$buildDir/libobjcexception.dylib" } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjcexception.dylib") } } @@ -4377,7 +4377,7 @@ if (PlatformInfo.isAppleTarget(project)) { args "-lobjc", '-fobjc-arc' args '-fPIC', '-shared', '-o', "$buildDir/libobjc_kt42172.dylib" } - if (project.target instanceof KonanTarget.IOS_X64) { + if (UtilsKt.isSimulatorTarget(project, project.target)) { UtilsKt.codesign(project, "$buildDir/libobjc_kt42172.dylib") } } diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt index 5952c5ce13e..684d8af514b 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt @@ -158,6 +158,12 @@ fun codesign(project: Project, path: String) { } } +/** + * Check that [target] is Apple simulator + */ +fun isSimulatorTarget(project: Project, target: KonanTarget): Boolean = + project.platformManager.platform(target).targetTriple.isSimulator + /** * Creates a list of file paths to be compiled from the given [compile] list with regard to [exclude] list. */