actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: do not set CPATH when using LLVM

This commit is contained in:
Amin Yahyaabadi 2023-05-23 20:59:10 -07:00
parent 8c72d55c11
commit 5959d53e9f
10 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/node12/actions_python.5b1184cd.js → dist/node12/actions_python.9a1ee818.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node12/actions_python.5b1184cd.js.map → dist/node12/actions_python.9a1ee818.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node12/setup-cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node12/setup-cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/node16/actions_python.06ec7b4d.js → dist/node16/actions_python.e9b4bbb3.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node16/actions_python.06ec7b4d.js.map → dist/node16/actions_python.e9b4bbb3.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node16/setup-cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/node16/setup-cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

19
src/llvm/llvm.ts
View File

@ -93,15 +93,16 @@ export async function activateLLVM(directory: string, versionGiven: string) {
setupMacOSSDK(), setupMacOSSDK(),
] ]
// windows builds fail with llvm's CPATH // TODO Causes issues with clangd
if (process.platform !== "win32") { // TODO Windows builds fail with llvm's CPATH
const llvmMajor = semverMajor(version) // if (process.platform !== "win32") {
if (await pathExists(`${directory}/lib/clang/${version}/include`)) { // const llvmMajor = semverMajor(version)
promises.push(addEnv("CPATH", `${directory}/lib/clang/${version}/include`)) // if (await pathExists(`${directory}/lib/clang/${version}/include`)) {
} else if (await pathExists(`${directory}/lib/clang/${llvmMajor}/include`)) { // promises.push(addEnv("CPATH", `${directory}/lib/clang/${version}/include`))
promises.push(addEnv("CPATH", `${directory}/lib/clang/${llvmMajor}/include`)) // } else if (await pathExists(`${directory}/lib/clang/${llvmMajor}/include`)) {
} // promises.push(addEnv("CPATH", `${directory}/lib/clang/${llvmMajor}/include`))
} // }
// }
if (isUbuntu()) { if (isUbuntu()) {
promises.push( promises.push(

2
src/main.ts
View File

@ -214,7 +214,7 @@ export async function main(args: string[]): Promise<number> {
const installationInfo = await setupGcc(gccVersion, join(setupCppDir, "gcc"), arch) const installationInfo = await setupGcc(gccVersion, join(setupCppDir, "gcc"), arch)
if (hasLLVM) { if (hasLLVM) {
// remove the CPPFLAGS of LLVM that include the LLVM headers // remove back the added CPPFLAGS of LLVM that include the LLVM headers
await addEnv("CPPFLAGS", "") await addEnv("CPPFLAGS", "")
} }