azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure linker from sysroot is used (#834)

Browse Source
This commit is contained in:
Nikolay Igotti
2017-09-05 15:35:23 +03:00
committed by GitHub
parent cc0809d315
commit 43a975ad73
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt
-1
View File
@@ -518,7 +518,6 @@ internal class NativeIndexImpl(val library: NativeLibrary) : NativeIndex() {
clang_disposeTokens(translationUnit, tokens, numTokens) clang_disposeTokens(translationUnit, tokens, numTokens)
} }
} }
TODO()
} }
private fun isSuitableFunction(cursor: CValue<CXCursor>): Boolean { private fun isSuitableFunction(cursor: CValue<CXCursor>): Boolean {
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+2 -1
View File
@@ -244,7 +244,8 @@ private fun Properties.defaultCompilerOpts(target: String, dependencies: String)
val libGcc = getTargetSpecific("libGcc", target) val libGcc = getTargetSpecific("libGcc", target)
val binDir = "$targetSysRoot/${libGcc ?: "bin"}" val binDir = "$targetSysRoot/${libGcc ?: "bin"}"
return archSelector + commonArgs + listOf( return archSelector + commonArgs + listOf(
"-B$binDir", "--gcc-toolchain=$targetToolchain") "-B$binDir", "--gcc-toolchain=$targetToolchain",
"-fuse-ld=$targetToolchain/bin/ld")
} }
"mingw" -> { "mingw" -> {
return archSelector + commonArgs + listOf("-B$targetSysRoot/bin") return archSelector + commonArgs + listOf("-B$targetSysRoot/bin")