Skip to content

Commit 4fb9879

Browse files
committed
fix: prefer exe binaries for llvm on Windows
1 parent 6f44503 commit 4fb9879

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

dist/legacy/setup-cpp.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.mjs

+1-1
Large diffs are not rendered by default.

dist/modern/setup-cpp.mjs.map

+1-1
Large diffs are not rendered by default.

src/llvm/llvm_url.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { arm64, armv7, powerpc64le, sparc64, sparcv9, x86, x86_64 } from "../uti
77
import { hasDnf } from "../utils/env/hasDnf.js"
88
import { isUbuntu } from "../utils/env/isUbuntu.js"
99
import { ubuntuVersion } from "../utils/env/ubuntu_version.js"
10-
import { extractExe, extractTarByExe } from "../utils/setup/extract.js"
10+
import { extractExe, extractTarByExe, getArchiveType, getExtractFunction } from "../utils/setup/extract.js"
1111
import type { PackageInfo } from "../utils/setup/setupBin.js"
1212

1313
const dirname = typeof __dirname === "string" ? __dirname : path.dirname(fileURLToPath(import.meta.url))
@@ -26,7 +26,7 @@ export async function getLLVMPackageInfo(
2626
binRelativeDir: "bin",
2727
binFileName: addExeExt("clang"),
2828
extractFunction: platform === "win32"
29-
? extractExe
29+
? getExtractFunction(getArchiveType(url))
3030
: (file: string, dest: string) => {
3131
return extractTarByExe(file, dest, 1)
3232
},
@@ -83,6 +83,7 @@ async function getAssetKeywords(platform: string, arch: string) {
8383

8484
switch (platform) {
8585
case "win32": {
86+
optionalKeywords.push(".exe")
8687
const osKeywordsChoice: string[] = ["windows", "Windows"]
8788
if (x86_64.includes(arch)) {
8889
osKeywordsChoice.push("win64", "win64", "win64")

0 commit comments

Comments
 (0)