From 99c02855a892c243e09ec0e8ddd7074edeadd1ef Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 22 Nov 2020 12:25:56 +0100 Subject: [PATCH] [GITHUB] Add clang-cl location to the beginning of PATH instead of the end. Fixes build with the latest VS2019 (16.8.2). The new version now adds Llvm\x64\bin to the PATH of the "x64_x86 Cross Tools Commannd Prompt", so we must override this to get x86 clang. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 080bf8b4769..3b61db65ac0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: run: | mkdir build cd build - $env:PATH = "$env:PATH;$env:VCToolsInstallDir\..\..\Llvm\bin" + $env:PATH = "$env:VCToolsInstallDir\..\..\Llvm\bin;$env:PATH" cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=1 ${{github.workspace}}\src - name: Build working-directory: ${{github.workspace}}\build