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

Interop/StubGenerator: do not use hard-coded path to JNI headers

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2016-09-22 13:39:56 +03:00
parent 9e248a57b9
commit b3f554efc2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+4 -1
View File
@@ -56,8 +56,11 @@ fun main(args: Array<String>) {
val outOFile = createTempFile(suffix = ".o") val outOFile = createTempFile(suffix = ".o")
val javaHome = System.getProperty("java.home")
val compilerArgsForJniIncludes = listOf("", "linux", "darwin").map { "-I$javaHome/../include/$it" }.toTypedArray()
val compilerCmd = arrayOf(compiler, *compilerOpts.toTypedArray(), val compilerCmd = arrayOf(compiler, *compilerOpts.toTypedArray(),
"-I/System/Library/Frameworks/JavaVM.framework/Headers", // FIXME *compilerArgsForJniIncludes,
"-c", outCFile.path, "-o", outOFile.path) "-c", outCFile.path, "-o", outOFile.path)
println(compilerCmd.joinToString(" ")) println(compilerCmd.joinToString(" "))