Use llbuild.framework bundled with the internal toolchain

^KT-61369
This commit is contained in:
Timofey Solonin
2023-09-12 11:12:20 +02:00
committed by Space Team
parent fd2954a8d3
commit 9e7d9f3b53
3 changed files with 19 additions and 8 deletions
@@ -120,7 +120,7 @@ data class ProcessOutput(var stdOut: String, var stdErr: String, var exitCode: I
* @param args arguments for a process
*/
fun runProcess(executor: (Action<in ExecSpec>) -> ExecResult?,
executable: String, args: List<String>): ProcessOutput {
executable: String, args: List<String>, env: Map<String, String> = emptyMap()): ProcessOutput {
val outStream = ByteArrayOutputStream()
val errStream = ByteArrayOutputStream()
@@ -130,6 +130,7 @@ fun runProcess(executor: (Action<in ExecSpec>) -> ExecResult?,
this.standardOutput = outStream
this.errorOutput = errStream
this.isIgnoreExitValue = true
this.environment(env)
})
checkNotNull(execResult)
@@ -300,7 +300,10 @@ fun compileSwift(
options + "-o" + output.toString() + sources +
if (fullBitcode) listOf("-embed-bitcode", "-Xlinker", "-bitcode_verify") else listOf("-embed-bitcode-marker")
val (stdOut, stdErr, exitCode) = runProcess(executor = localExecutor(project), executable = compiler, args = args)
val (stdOut, stdErr, exitCode) = runProcess(
executor = localExecutor(project), executable = compiler, args = args,
env = mapOf("DYLD_FALLBACK_FRAMEWORK_PATH" to configs.absoluteTargetToolchain + "/ExtraFrameworks")
)
println(
"""