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

[KT-54284][Native] Produce deterministic klibs from cinterop. (#4979)

Browse Source 
Pass in temp-file C sources to clang via stdin instead of by name.
This prevents absolute paths of temp files from being encoded in bitcode.
This commit is contained in:
Martin Petrov
2022-10-21 06:16:34 -04:00
committed by GitHub
parent 68bcff3194
commit 6c0b4bcfd4
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt
+12 -3
View File
@@ -18,12 +18,13 @@ package org.jetbrains.kotlin.konan.exec
import org.jetbrains.kotlin.konan.KonanExternalToolFailure
import java.io.BufferedReader
import java.io.File
import java.io.InputStreamReader
import java.lang.ProcessBuilder.Redirect
import java.nio.file.Files
open class Command(initialCommand: List<String>) {
open class Command(initialCommand: List<String>, val redirectInputFile: File? = null) {
constructor(tool: String) : this(listOf(tool))
constructor(vararg command: String) : this(command.toList<String>())
@@ -58,7 +59,11 @@ open class Command(initialCommand: List<String>) {
val builder = ProcessBuilder(command)
builder.redirectOutput(Redirect.INHERIT)
builder.redirectInput(Redirect.INHERIT)
if (redirectInputFile == null) {
builder.redirectInput(Redirect.INHERIT)
} else {
builder.redirectInput(redirectInputFile)
}
val process = builder.start()
@@ -90,7 +95,11 @@ open class Command(initialCommand: List<String>) {
try {
val builder = ProcessBuilder(command)
builder.redirectInput(Redirect.INHERIT)
if (redirectInputFile == null) {
builder.redirectInput(Redirect.INHERIT)
} else {
builder.redirectInput(redirectInputFile)
}
builder.redirectError(Redirect.INHERIT)
builder.redirectOutput(Redirect.to(outputFile))
.redirectErrorStream(withErrors)