From f8864205403e5e261a057b601f92e24b1edaca4f Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 8 Jan 2024 17:02:25 +0200 Subject: [PATCH] Quotes and escaping --- .github/workflows/rtools-make.yml | 4 ++-- lib/tbb_2020.3/build/windows.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rtools-make.yml b/.github/workflows/rtools-make.yml index af15f0f398b..357ddb85b0d 100644 --- a/.github/workflows/rtools-make.yml +++ b/.github/workflows/rtools-make.yml @@ -21,7 +21,7 @@ concurrency: jobs: rtools-build-check: runs-on: windows-latest - name: R {{ matrix.config.r }} with Rtools {{ matrix.config.rtools }} + name: R ${{ matrix.config.r }} with Rtools ${{ matrix.config.rtools }} strategy: fail-fast: false @@ -42,7 +42,7 @@ jobs: rtools-version: ${{ matrix.config.rtools }} - name: Set path for Rtools${{ matrix.config.rtools }} - run: echo ${{ matrix.config.path }} | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 + run: echo "${{ matrix.config.path }}" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - name: Build Math libs shell: powershell diff --git a/lib/tbb_2020.3/build/windows.inc b/lib/tbb_2020.3/build/windows.inc index 8c8ca23c1b5..186f4bd99ca 100644 --- a/lib/tbb_2020.3/build/windows.inc +++ b/lib/tbb_2020.3/build/windows.inc @@ -26,11 +26,11 @@ detect_js = $(shell cmd //C "cscript //NoLogo //E:jscript $(tbb_root)/build/dete # TODO give an error if archs doesn't match ifndef arch - export arch:=$(call detect_js, /arch $(compiler)) + export arch:=$(call detect_js, //arch $(compiler)) endif ifndef runtime - export runtime:=$(call detect_js, /runtime $(compiler)) + export runtime:=$(call detect_js, //runtime $(compiler)) endif native_compiler := cl