Skip to content

Commit 315189b

Browse files
committed
fix: install LLVM dependencies after LLVM
1 parent a654826 commit 315189b

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

dist/actions/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/llvm/llvm.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ export async function setupLLVM(version: string, setupDir: string, arch: string)
2323
}
2424

2525
async function setupLLVMWithoutActivation_raw(version: string, setupDir: string, arch: string) {
26-
// install LLVM and its dependencies in parallel
27-
const [installationInfo, _1, _2] = await Promise.all([
26+
// install LLVM
27+
const [installationInfo, _1] = await Promise.all([
2828
setupLLVMOnly(version, setupDir, arch),
29-
setupLLVMDeps(arch),
3029
addLLVMLoggingMatcher(),
3130
])
3231

32+
// install LLVM dependencies
33+
await setupLLVMDeps(arch)
34+
3335
return installationInfo
3436
}
3537
const setupLLVMWithoutActivation = memoize(setupLLVMWithoutActivation_raw, { isPromise: true })

0 commit comments

Comments
 (0)