Skip to content

Commit 25cb863

Browse files
authored
Merge pull request #62 from aminya/llvm-path [skip ci]
2 parents 3e61953 + 5ac28d1 commit 25cb863

File tree

3 files changed

+6
-3
lines changed

3 files changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,11 @@ export async function main(args: string[]): Promise<number> {
161161
// get the setup function
162162
const setupFunction = setups[tool]
163163

164+
// the tool installation directory (for the functions that ue it)
165+
const setupDir = join(setupCppDir, ["llvm", "clangformat", "clangtidy"].includes(tool) ? "llvm" : tool)
166+
164167
// eslint-disable-next-line no-await-in-loop
165-
installationInfo = await setupFunction(getVersion(tool, version), join(setupCppDir, tool), arch)
168+
installationInfo = await setupFunction(getVersion(tool, version), setupDir, arch)
166169
}
167170
// preparing a report string
168171
successMessages.push(getSuccessMessage(tool, installationInfo))

0 commit comments

Comments
 (0)