Skip to content

Commit 9700bb5

Browse files
committed
fix: fix setting CPATH
1 parent 9b3ba25 commit 9700bb5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
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/llvm/llvm.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,14 +274,14 @@ export async function activateLLVM(directory: string, versionGiven: string) {
274274

275275
addEnv("LLVM_PATH", directory) // the output of this action
276276

277-
const llvmMajor = semverMajor(version)
278-
279277
// Setup LLVM as the compiler
280278
addEnv("LD_LIBRARY_PATH", `${lib}${path.delimiter}${ld}`)
281279
addEnv("DYLD_LIBRARY_PATH", `${lib}${path.delimiter}${dyld}`)
282280

283-
if (process.platform !== "win32") {
284-
// https://github.com/aminya/setup-cpp/issues/6
281+
const llvmMajor = semverMajor(version)
282+
if (existsSync(`${directory}/lib/clang/${version}/include`)) {
283+
addEnv("CPATH", `${directory}/lib/clang/${version}/include`)
284+
} else if (existsSync(`${directory}/lib/clang/${llvmMajor}/include`)) {
285285
addEnv("CPATH", `${directory}/lib/clang/${llvmMajor}/include`)
286286
}
287287

0 commit comments

Comments
 (0)