From da556452c91b4479cf6e139fee3a61875b577578 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 24 Jan 2022 18:30:41 +0300 Subject: [PATCH] Use project directory as a base for stdlib js build Some sources for kotlin-stdlib-js-ir are not copied to build dir and used directly from the project. Modify kotlin.test/js-ir as well, while there's no evidence of the problem so far. Should be removed after KT-50876 fix. ^KTI-730 In Progress --- libraries/kotlin.test/js-ir/build.gradle.kts | 2 +- libraries/stdlib/js-ir/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts index 0ffd46288be..2613286387f 100644 --- a/libraries/kotlin.test/js-ir/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/build.gradle.kts @@ -55,7 +55,7 @@ tasks.withType>().configureEach { doFirst { kotlinOptions.freeCompilerArgs += listOfNotNull( - "-Xklib-relative-path-base=$buildDir".takeIf { !kotlinBuildProperties.getBoolean("kotlin.build.use.absolute.paths.in.klib") } + "-Xklib-relative-path-base=$buildDir,$projectDir".takeIf { !kotlinBuildProperties.getBoolean("kotlin.build.use.absolute.paths.in.klib") } ) } } diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index f8412b3517b..61afbc84977 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -146,7 +146,7 @@ tasks.withType>().configureEach { doFirst { kotlinOptions.freeCompilerArgs += listOfNotNull( - "-Xklib-relative-path-base=$buildDir".takeIf { !kotlinBuildProperties.getBoolean("kotlin.build.use.absolute.paths.in.klib") } + "-Xklib-relative-path-base=$buildDir,$projectDir".takeIf { !kotlinBuildProperties.getBoolean("kotlin.build.use.absolute.paths.in.klib") } ) } }