diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/util.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/util.kt index 7eeda2ba277..f10f96b7486 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/util.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/util.kt @@ -41,7 +41,7 @@ fun String.prefixIfNot(prefix: String) = if (this.startsWith(prefix)) this else "$prefix$this" fun String.prefixBaseNameIfNot(prefix: String): String { - val file = File(this) + val file = File(this).absoluteFile val name = file.name val directory = file.parent return "$directory/${name.prefixIfNot(prefix)}" diff --git a/backend.native/konan.properties b/backend.native/konan.properties index 9afd07006ab..8d3a70a22fe 100644 --- a/backend.native/konan.properties +++ b/backend.native/konan.properties @@ -149,6 +149,7 @@ libGcc.raspberrypi = lib/gcc/arm-linux-gnueabihf/4.8.3 llvmLtoFlags.raspberrypi = -float-abi=hard -mcpu=arm1136jf-s llvmLtoOptFlags.raspberrypi = -O3 -function-sections llvmLtoNooptFlags.raspberrypi = -O1 +llvmLtoDynamicFlags.raspberrypi = -relocation-model=pic dynamicLinker.raspberrypi = /lib/ld-linux-armhf.so.3 # targetSysRoot relative abiSpecificLibraries.raspberrypi = \ @@ -177,6 +178,7 @@ libGcc.linux_mips32 = lib/gcc/mips-unknown-linux-gnu/4.9.4 llvmLtoFlags.linux_mips32 = llvmLtoOptFlags.linux_mips32 = -O3 -function-sections llvmLtoNooptFlags.linux_mips32 = -O1 +llvmLtoDynamicFlags.linux_mips32 = -relocation-model=pic dynamicLinker.linux_mips32 = /lib/ld.so.1 # targetSysRoot relative abiSpecificLibraries.linux_mips32 = @@ -202,6 +204,7 @@ libGcc.linux_mipsel32 = lib/gcc/mipsel-unknown-linux-gnu/4.9.4 llvmLtoFlags.linux_mipsel32 = llvmLtoOptFlags.linux_mipsel32 = -O3 -function-sections llvmLtoNooptFlags.linux_mipsel32 = -O1 +llvmLtoDynamicFlags.linux_mipsel32 = -relocation-model=pic dynamicLinker.linux_mipsel32 = /lib/ld.so.1 # targetSysRoot relative abiSpecificLibraries.linux_mipsel32 = diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 4e5783a9269..44e1499fc6d 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -2337,6 +2337,7 @@ if (isMac()) { } task produce_dynamic(type: DynamicKonanTest) { + disabled = (project.testTarget != null && project.testTarget != project.hostName) source = "produce_dynamic/simple/hello.kt" cSource = "$projectDir/produce_dynamic/simple/main.c" goldValue = "Hello, dynamic!\n"