From b3f554efc2d6ddbab2811a38596a3e24e5e6c1af Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 22 Sep 2016 13:39:56 +0300 Subject: [PATCH] Interop/StubGenerator: do not use hard-coded path to JNI headers --- .../org/jetbrains/kotlin/native/interop/gen/jvm/main.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt index 8fc2ab96f01..e250227f8bc 100644 --- a/experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt +++ b/experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt @@ -56,8 +56,11 @@ fun main(args: Array) { 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(), - "-I/System/Library/Frameworks/JavaVM.framework/Headers", // FIXME + *compilerArgsForJniIncludes, "-c", outCFile.path, "-o", outOFile.path) println(compilerCmd.joinToString(" "))