Skip to content

Commit 209bb28

Browse files
committed
fix: add the exe extension for CC/CXX
1 parent c8f6527 commit 209bb28

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

dist/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/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/gcc/gcc.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { setupMacOSSDK } from "../macos-sdk/macos-sdk"
99
import path from "path"
1010
import { warning, info } from "../utils/io/io"
1111
import { isGitHubCI } from "../utils/env/isci"
12+
import { addBinExtension } from "../utils/extension/extension"
1213

1314
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1415
export async function setupGcc(version: string, _setupDir: string, arch: string) {
@@ -83,7 +84,7 @@ async function activateGcc(version: string, binDir: string) {
8384
// )
8485

8586
if (process.platform === "win32") {
86-
promises.push(addEnv("CC", `${binDir}/gcc`), addEnv("CXX", `${binDir}/g++`))
87+
promises.push(addEnv("CC", addBinExtension(`${binDir}/gcc`)), addEnv("CXX", addBinExtension(`${binDir}/g++`)))
8788
} else {
8889
const majorVersion = semverMajor(semverCoerce(version) ?? version)
8990
if (majorVersion >= 5) {

src/llvm/llvm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ export async function activateLLVM(directory: string, versionGiven: string) {
314314
addEnv("CPPFLAGS", `-I'${directory}/include'`),
315315

316316
// compiler paths
317-
addEnv("CC", `${directory}/bin/clang`),
318-
addEnv("CXX", `${directory}/bin/clang++`),
317+
addEnv("CC", addBinExtension(`${directory}/bin/clang`)),
318+
addEnv("CXX", addBinExtension(`${directory}/bin/clang++`)),
319319

320320
addEnv("LIBRARY_PATH", `${directory}/lib`),
321321

0 commit comments

Comments
 (0)