Skip to content

Commit 8ffe76c

Browse files
committed
fix: prefer complete Window LLVM package
1 parent 0fa8654 commit 8ffe76c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/modern/setup-cpp.mjs.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_url.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ async function getAssetKeywords(platform: string, arch: string) {
8383

8484
switch (platform) {
8585
case "win32": {
86-
// prefer exe over tar.xz for windows
87-
optionalKeywords.push(".exe", ".exe")
86+
// prefer tar.xz packages of LLVM over exe as they provide a more complete LLVM package
87+
optionalKeywords.push(".tar.xz", ".tar.xz")
8888
const osKeywordsChoice: string[] = []
8989
if (x86_64.includes(arch)) {
9090
osKeywordsChoice.push("win64")

src/utils/setup/extract.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ async function installTarDependencies(archiveType: ArchiveType) {
176176
await installApkPack([{ name: "gzip" }, { name: "tar" }])
177177
}
178178
}
179-
break
179+
return
180180
}
181181
case ArchiveType.TarXz: {
182182
if (process.platform === "linux") {
@@ -191,7 +191,7 @@ async function installTarDependencies(archiveType: ArchiveType) {
191191
await installApkPack([{ name: "xz" }, { name: "tar" }])
192192
}
193193
}
194-
break
194+
return
195195
}
196196
default:
197197
throw new Error(`Unsupported archive type: ${archiveType} for tar extraction`)

0 commit comments

Comments
 (0)