mirror of https://github.com/aminya/setup-cpp
fix: install LLVM dependencies after LLVM
This commit is contained in:
parent
a65482651a
commit
315189b36f
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -23,13 +23,15 @@ export async function setupLLVM(version: string, setupDir: string, arch: string)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function setupLLVMWithoutActivation_raw(version: string, setupDir: string, arch: string) {
|
async function setupLLVMWithoutActivation_raw(version: string, setupDir: string, arch: string) {
|
||||||
// install LLVM and its dependencies in parallel
|
// install LLVM
|
||||||
const [installationInfo, _1, _2] = await Promise.all([
|
const [installationInfo, _1] = await Promise.all([
|
||||||
setupLLVMOnly(version, setupDir, arch),
|
setupLLVMOnly(version, setupDir, arch),
|
||||||
setupLLVMDeps(arch),
|
|
||||||
addLLVMLoggingMatcher(),
|
addLLVMLoggingMatcher(),
|
||||||
])
|
])
|
||||||
|
|
||||||
|
// install LLVM dependencies
|
||||||
|
await setupLLVMDeps(arch)
|
||||||
|
|
||||||
return installationInfo
|
return installationInfo
|
||||||
}
|
}
|
||||||
const setupLLVMWithoutActivation = memoize(setupLLVMWithoutActivation_raw, { isPromise: true })
|
const setupLLVMWithoutActivation = memoize(setupLLVMWithoutActivation_raw, { isPromise: true })
|
||||||
|
|
Loading…
Reference in New Issue