Skip to content

Commit 5959d53

Browse files
committed
fix: do not set CPATH when using LLVM
1 parent 8c72d55 commit 5959d53

10 files changed

+21
-20
lines changed

dist/node12/actions_python.5b1184cd.js renamed to dist/node12/actions_python.9a1ee818.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/actions_python.5b1184cd.js.map renamed to dist/node12/actions_python.9a1ee818.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/node12/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/node12/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/node16/actions_python.06ec7b4d.js renamed to dist/node16/actions_python.e9b4bbb3.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/actions_python.06ec7b4d.js.map renamed to dist/node16/actions_python.e9b4bbb3.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/node16/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/node16/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: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,16 @@ export async function activateLLVM(directory: string, versionGiven: string) {
9393
setupMacOSSDK(),
9494
]
9595

96-
// windows builds fail with llvm's CPATH
97-
if (process.platform !== "win32") {
98-
const llvmMajor = semverMajor(version)
99-
if (await pathExists(`${directory}/lib/clang/${version}/include`)) {
100-
promises.push(addEnv("CPATH", `${directory}/lib/clang/${version}/include`))
101-
} else if (await pathExists(`${directory}/lib/clang/${llvmMajor}/include`)) {
102-
promises.push(addEnv("CPATH", `${directory}/lib/clang/${llvmMajor}/include`))
103-
}
104-
}
96+
// TODO Causes issues with clangd
97+
// TODO Windows builds fail with llvm's CPATH
98+
// if (process.platform !== "win32") {
99+
// const llvmMajor = semverMajor(version)
100+
// if (await pathExists(`${directory}/lib/clang/${version}/include`)) {
101+
// promises.push(addEnv("CPATH", `${directory}/lib/clang/${version}/include`))
102+
// } else if (await pathExists(`${directory}/lib/clang/${llvmMajor}/include`)) {
103+
// promises.push(addEnv("CPATH", `${directory}/lib/clang/${llvmMajor}/include`))
104+
// }
105+
// }
105106

106107
if (isUbuntu()) {
107108
promises.push(

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export async function main(args: string[]): Promise<number> {
214214
const installationInfo = await setupGcc(gccVersion, join(setupCppDir, "gcc"), arch)
215215

216216
if (hasLLVM) {
217-
// remove the CPPFLAGS of LLVM that include the LLVM headers
217+
// remove back the added CPPFLAGS of LLVM that include the LLVM headers
218218
await addEnv("CPPFLAGS", "")
219219
}
220220

0 commit comments

Comments
 (0)