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

fix: only escape LDFLAGS and CPPFLAGS 

This partially reverts 41d161c37f
This commit is contained in:
Amin Yahyaabadi 2022-05-11 17:17:54 -07:00
parent 4109838bca
commit 3eb3fc16a7
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/llvm/llvm.ts
View File

@ -317,8 +317,8 @@ export async function activateLLVM(directory: string, versionGiven: string) {
} }
} }
addEnv("LDFLAGS", `-L${directory}/lib`) addEnv("LDFLAGS", `-L${directory}/lib`, true)
addEnv("CPPFLAGS", `-I${directory}/include`) addEnv("CPPFLAGS", `-I${directory}/include`, true)
addEnv("CC", `${directory}/bin/clang`) addEnv("CC", `${directory}/bin/clang`)
addEnv("CXX", `${directory}/bin/clang++`) addEnv("CXX", `${directory}/bin/clang++`)

5
src/utils/env/addEnv.ts vendored
View File

@ -8,7 +8,7 @@ import { delimiter } from "path"
import { escapeSpace } from "../path/escape_space" import { escapeSpace } from "../path/escape_space"
/** An add path function that works locally or inside GitHub Actions */ /** An add path function that works locally or inside GitHub Actions */
export function addEnv(name: string, valGiven: string | undefined, shouldEscapeSpace: boolean = true) { export function addEnv(name: string, valGiven: string | undefined, shouldEscapeSpace: boolean = false) {
const val = shouldEscapeSpace ? escapeSpace(valGiven) : valGiven const val = shouldEscapeSpace ? escapeSpace(valGiven) : valGiven
try { try {
if (isGitHubCI()) { if (isGitHubCI()) {
@ -28,8 +28,7 @@ export function addEnv(name: string, valGiven: string | undefined, shouldEscapeS
} }
/** An add path function that works locally or inside GitHub Actions */ /** An add path function that works locally or inside GitHub Actions */
export function addPath(pathGiven: string, shouldEscapeSpace: boolean = true) { export function addPath(path: string) {
const path = shouldEscapeSpace ? escapeSpace(pathGiven) : pathGiven
process.env.PATH = `${path}${delimiter}${process.env.PATH}` process.env.PATH = `${path}${delimiter}${process.env.PATH}`
try { try {
if (isGitHubCI()) { if (isGitHubCI()) {