From 43a975ad7304524f5c5a5d34a590a0297e1a5065 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Tue, 5 Sep 2017 15:35:23 +0300 Subject: [PATCH] Ensure linker from sysroot is used (#834) --- .../org/jetbrains/kotlin/native/interop/indexer/Indexer.kt | 1 - .../kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt index b80e3cda937..0acbbb59fe4 100644 --- a/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt +++ b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt @@ -518,7 +518,6 @@ internal class NativeIndexImpl(val library: NativeLibrary) : NativeIndex() { clang_disposeTokens(translationUnit, tokens, numTokens) } } - TODO() } private fun isSuitableFunction(cursor: CValue): Boolean { diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt index 7d811327d15..1eedbcb801f 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt @@ -244,7 +244,8 @@ private fun Properties.defaultCompilerOpts(target: String, dependencies: String) val libGcc = getTargetSpecific("libGcc", target) val binDir = "$targetSysRoot/${libGcc ?: "bin"}" return archSelector + commonArgs + listOf( - "-B$binDir", "--gcc-toolchain=$targetToolchain") + "-B$binDir", "--gcc-toolchain=$targetToolchain", + "-fuse-ld=$targetToolchain/bin/ld") } "mingw" -> { return archSelector + commonArgs + listOf("-B$targetSysRoot/bin")