Skip to content

Commit

Permalink
fix: install LLVM dependencies after LLVM
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Aug 12, 2024
1 parent a654826 commit 315189b
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion dist/actions/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/actions/setup-cpp.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.js.map

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions src/llvm/llvm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ export async function setupLLVM(version: string, setupDir: string, arch: string)
}

async function setupLLVMWithoutActivation_raw(version: string, setupDir: string, arch: string) {
// install LLVM and its dependencies in parallel
const [installationInfo, _1, _2] = await Promise.all([
// install LLVM
const [installationInfo, _1] = await Promise.all([
setupLLVMOnly(version, setupDir, arch),
setupLLVMDeps(arch),
addLLVMLoggingMatcher(),
])

// install LLVM dependencies
await setupLLVMDeps(arch)

return installationInfo
}
const setupLLVMWithoutActivation = memoize(setupLLVMWithoutActivation_raw, { isPromise: true })
Expand Down

0 comments on commit 315189b

Please sign in to comment.