Merge pull request #78 from aminya/spaces [skip ci]

fix: escape the spaces in LDFLAGS and CPPFLAGS

Author: aminya

dist/setup_cpp.js

@@ -37,6 +37,7 @@
     "@actions/exec": "^1.1.1",
     "@actions/io": "^1.1.2",
     "@actions/tool-cache": "^1.7.2",
+    "escape-path-with-spaces": "^1.0.0",
     "execa": "^5.1.1",
     "mri": "^1.2.0",
     "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",

dist/setup_cpp.js.map

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

package.json

@@ -5,9 +5,11 @@ import { appendFileSync, existsSync, readFileSync } from "fs"
 import { error, warning } from "../io/io"
 import { execPowershell } from "../exec/powershell"
 import { delimiter } from "path"
+import { escapeSpace } from "../path/escape_space"
 
 /** An add path function that works locally or inside GitHub Actions */
-export function addEnv(name: string, val: string | undefined) {
+export function addEnv(name: string, valGiven: string | undefined, shouldEscapeSpace: boolean = false) {
+  const val = shouldEscapeSpace ? escapeSpace(valGiven) : valGiven
   try {
     if (isGitHubCI()) {
       exportVariable(name, val)

pnpm-lock.yaml

@@ -0,0 +1,11 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import escape from "escape-path-with-spaces"
+
+/// Escape the spaces in the given path
+export function escapeSpace(path: string | undefined): string {
+  if (path === undefined) {
+    return ""
+  }
+  return escape(path)
+}

src/llvm/llvm.ts

@@ -7,7 +7,7 @@ import spawn from "cross-spawn"
 import { existsSync } from "fs"
 
 export async function setupTmpDir(testName: string) {
-  const tempDirectory = path.join(tmpdir(), "setup-cpp", testName)
+  const tempDirectory = path.join(tmpdir(), "setup cpp temp", testName)
   try {
     await io.rmRF(tempDirectory)
     await io.mkdirP(tempDirectory)