Skip to content

Commit f23c0b8

Browse files
committed
fix: install base compilers for vcpkg on alpine
1 parent d8d2cae commit f23c0b8

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
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/vcpkg/vcpkg.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,17 @@ export async function setupVcpkg(version: string, setupDir: string, arch: string
5656
{ name: "pkg-config" },
5757
])
5858
} else if (await hasApk()) {
59-
await installApkPack([
59+
const deps = [
6060
{ name: "curl" },
6161
{ name: "zip" },
6262
{ name: "unzip" },
6363
{ name: "tar" },
6464
{ name: "pkgconf" },
65-
])
65+
]
66+
if (arm64.includes(arch)) {
67+
deps.push({ name: "build-base" })
68+
}
69+
await installApkPack(deps)
6670
}
6771
}
6872

@@ -83,7 +87,7 @@ export async function setupVcpkg(version: string, setupDir: string, arch: string
8387
}
8488

8589
// Add VCPKG_FORCE_SYSTEM_BINARIES=1 for Linux arm64
86-
if (process.platform === "linux" && arch in arm64) {
90+
if (process.platform === "linux" && arm64.includes(arch)) {
8791
await addEnv("VCPKG_FORCE_SYSTEM_BINARIES", "1")
8892
}
8993

0 commit comments

Comments
 (0)