diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt index 34a7d9986f8..e1d35a12afd 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttributes.kt @@ -47,7 +47,7 @@ private fun shouldEnforceFramePointer(context: Context): Boolean { } return when (context.config.target.family) { - Family.OSX, Family.IOS -> context.shouldContainLocationDebugInfo() + Family.OSX, Family.IOS, Family.WATCHOS, Family.TVOS -> context.shouldContainLocationDebugInfo() Family.LINUX, Family.MINGW, Family.ANDROID, Family.WASM, Family.ZEPHYR -> false } } diff --git a/gradle.properties b/gradle.properties index 188179c0898..4d804c6588c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,10 +18,10 @@ buildKotlinVersion=1.3.60-dev-1210 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1210,branch:default:any,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1666,branch:default:any,pinned:true/artifacts/content/maven -kotlinVersion=1.3.60-dev-1666 -kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1666,branch:default:any,pinned:true/artifacts/content/maven -kotlinStdlibVersion=1.3.60-dev-1666 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1867,branch:default:any,pinned:true/artifacts/content/maven +kotlinVersion=1.3.60-dev-1867 +kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1867,branch:default:any,pinned:true/artifacts/content/maven +kotlinStdlibVersion=1.3.60-dev-1867 testKotlinCompilerVersion=1.3.60-dev-1210 konanVersion=1.3.60 org.gradle.jvmargs='-Dfile.encoding=UTF-8'