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

fix: add the bin directory to the path for llvm installer

This commit is contained in:
Amin Yahyaabadi 2023-07-17 11:42:03 -07:00
parent c3a7043921
commit 60eecceb8a
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

14
src/llvm/llvm.ts
View File

@ -1,7 +1,7 @@
import { execRoot } from "admina" import { execRoot } from "admina"
import { GITHUB_ACTIONS } from "ci-info" import { GITHUB_ACTIONS } from "ci-info"
import { info, warning } from "ci-log" import { info, warning } from "ci-log"
import { ExecaReturnValue, execa } from "execa" import { execa } from "execa"
import { promises } from "fs" import { promises } from "fs"
const { readFile, writeFile, chmod } = promises const { readFile, writeFile, chmod } = promises
import memoize from "micro-memoize" import memoize from "micro-memoize"
@ -10,7 +10,7 @@ import { pathExists } from "path-exists"
import { addExeExt, join } from "patha" import { addExeExt, join } from "patha"
import { setupGcc } from "../gcc/gcc" import { setupGcc } from "../gcc/gcc"
import { setupMacOSSDK } from "../macos-sdk/macos-sdk" import { setupMacOSSDK } from "../macos-sdk/macos-sdk"
import { addEnv } from "../utils/env/addEnv" import { addEnv, addPath } from "../utils/env/addEnv"
import { isUbuntu } from "../utils/env/isUbuntu" import { isUbuntu } from "../utils/env/isUbuntu"
import { ubuntuVersion } from "../utils/env/ubuntu_version" import { ubuntuVersion } from "../utils/env/ubuntu_version"
import { hasNala, setupAptPack, updateAptAlternatives } from "../utils/setup/setupAptPack" import { hasNala, setupAptPack, updateAptAlternatives } from "../utils/setup/setupAptPack"
@ -69,6 +69,8 @@ async function setupLLVMApt(majorVersion: number): Promise<InstallationInfo> {
shell: true, shell: true,
}) })
await addPath(`${installationFolder}/bin`)
return { return {
installDir: `${installationFolder}`, installDir: `${installationFolder}`,
binDir: `${installationFolder}/bin`, binDir: `${installationFolder}/bin`,
@ -116,18 +118,16 @@ async function setupLLVMDeps_raw(arch: string) {
const setupLLVMDeps = memoize(setupLLVMDeps_raw, { isPromise: true }) const setupLLVMDeps = memoize(setupLLVMDeps_raw, { isPromise: true })
export async function activateLLVM(directory: string) { export async function activateLLVM(directory: string) {
const lib = join(directory, "lib")
const ld = process.env.LD_LIBRARY_PATH ?? "" const ld = process.env.LD_LIBRARY_PATH ?? ""
const dyld = process.env.DYLD_LIBRARY_PATH ?? "" const dyld = process.env.DYLD_LIBRARY_PATH ?? ""
const actPromises: Promise<void | ExecaReturnValue<string>>[] = [ const actPromises: Promise<any>[] = [
// the output of this action // the output of this action
addEnv("LLVM_PATH", directory), addEnv("LLVM_PATH", directory),
// Setup LLVM as the compiler // Setup LLVM as the compiler
addEnv("LD_LIBRARY_PATH", `${lib}${delimiter}${ld}`), addEnv("LD_LIBRARY_PATH", `${directory}/lib${delimiter}${ld}`),
addEnv("DYLD_LIBRARY_PATH", `${lib}${delimiter}${dyld}`), addEnv("DYLD_LIBRARY_PATH", `${directory}/lib${delimiter}${dyld}`),
// compiler flags // compiler flags
addEnv("LDFLAGS", `-L"${directory}/lib"`), addEnv("LDFLAGS", `-L"${directory}/lib"`),