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

set SIMCTL_CHILD_DYLD_LIBRARY_PATH for iphone simulator on older systems

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-05-23 23:37:48 +03:00
committed by Sergey Bogolepov
parent 7afcabffec
commit 82de083c1b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
+9 -1
View File
@@ -98,8 +98,16 @@ open class FrameworkTest : DefaultTask() {
?: throw RuntimeException("Executor wasn't found") ?: throw RuntimeException("Executor wasn't found")
// Hopefully, lexicographical comparison will work. // Hopefully, lexicographical comparison will work.
val newMacos = System.getProperty("os.version").compareTo("10.14.4") >= 0 val newMacos = System.getProperty("os.version").compareTo("10.14.4") >= 0
val dyldLibraryPathKey = if (target == KonanTarget.IOS_X64) {
"SIMCTL_CHILD_DYLD_LIBRARY_PATH"
} else {
"DYLD_LIBRARY_PATH"
}
val environment = if (newMacos) emptyMap() else mapOf(
dyldLibraryPathKey to libraryPath
)
val (stdOut, stdErr, exitCode) = runProcess( val (stdOut, stdErr, exitCode) = runProcess(
executor = executor.add(Action { it.environment = if (newMacos) emptyMap() else mapOf("DYLD_LIBRARY_PATH" to libraryPath) })::execute, executor = executor.add(Action { it.environment = environment })::execute,
executable = testExecutable.toString()) executable = testExecutable.toString())
println(""" println("""