Merge pull request #62 from aminya/llvm-path [skip ci]

This commit is contained in:
Amin Yahyaabadi 2022-04-26 22:34:49 -07:00 committed by GitHub
commit 25cb8633f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions

2
dist/setup_cpp.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -161,8 +161,11 @@ export async function main(args: string[]): Promise<number> {
// get the setup function // get the setup function
const setupFunction = setups[tool] const setupFunction = setups[tool]
// the tool installation directory (for the functions that ue it)
const setupDir = join(setupCppDir, ["llvm", "clangformat", "clangtidy"].includes(tool) ? "llvm" : tool)
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
installationInfo = await setupFunction(getVersion(tool, version), join(setupCppDir, tool), arch) installationInfo = await setupFunction(getVersion(tool, version), setupDir, arch)
} }
// preparing a report string // preparing a report string
successMessages.push(getSuccessMessage(tool, installationInfo)) successMessages.push(getSuccessMessage(tool, installationInfo))