From f964c48a8716ac9bd8287ef94e4c373d54fab88e Mon Sep 17 00:00:00 2001
From: Daniel Stankewitz <vouk@mailbox.org>
Date: Sun, 20 Mar 2022 18:19:31 +0100
Subject: [PATCH] Update build.yml

---
 .github/workflows/build.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3505723..3fbbd74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,18 +20,18 @@ jobs:
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           FOR /F "delims==" %%G IN ('where cl.exe') DO SET _cl_path=%%G > vars.sh
           echo CL_EXEC="%_cl_path%" >> vars.sh
-          echo "WSL_CL_EXEC=$(wslpath -u "$CL_EXEC")" >> vars.sh
-          echo "WSL_CL_PATH=$(dirname "$WSL_CL_EXEC")" >> vars.sh
-          echo export PATH=$PATH:$WSL_CL_PATH >> vars.sh
-          echo export DevEnvDir="%DevEnvDir% " >> vars.sh
-          echo export INCLUDE="%INCLUDE% " >> vars.sh
-          echo export LIB="%LIB% " >> vars.sh
-          echo export LIBPATH="%LIBPATH% " >> vars.sh
-          echo export VCINSTALLDIR="%VCINSTALLDIR% " >> vars.sh
-          echo export VSINSTALLDIR="%VSINSTALLDIR% " >> vars.sh
-          echo export VisualStudioVersion="%VisualStudioVersion% " >> vars.sh
-          echo export WSLcross=true >> vars.sh
-          echo export WSLENV=$WSLENV:INCLUDE/w:LIB/w:LIBPATH/w >> vars.sh
+          echo WSL_CL_EXEC=$(wslpath -u "$CL_EXEC") >> vars.sh
+          echo WSL_CL_PATH=$(dirname "$WSL_CL_EXEC") >> vars.sh
+          rem echo export PATH=$PATH:$WSL_CL_PATH >> vars.sh
+          rem echo export DevEnvDir="%DevEnvDir% " >> vars.sh
+          rem echo export INCLUDE="%INCLUDE% " >> vars.sh
+          rem echo export LIB="%LIB% " >> vars.sh
+          rem echo export LIBPATH="%LIBPATH% " >> vars.sh
+          rem echo export VCINSTALLDIR="%VCINSTALLDIR% " >> vars.sh
+          rem echo export VSINSTALLDIR="%VSINSTALLDIR% " >> vars.sh
+          rem echo export VisualStudioVersion="%VisualStudioVersion% " >> vars.sh
+          rem echo export WSLcross=true >> vars.sh
+          rem echo export WSLENV=$WSLENV:INCLUDE/w:LIB/w:LIBPATH/w >> vars.sh
       - name: Set up WSL
         uses: Vampire/setup-wsl@v1.2.0
         with:
@@ -42,6 +42,7 @@ jobs:
         run: |
           dos2unix vars.sh
           cat vars.sh
+          ./vars.sh
           #echo $ABC
           #echo $PATH
           #cl.exe