Retry mingw path

ckormanyos · Dec 29, 2023 · 9b85379 · 9b85379
1 parent 92ad88d
commit 9b85379
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/avr-gcc-build-msys2-gcc.yml b/.github/workflows/avr-gcc-build-msys2-gcc.yml
@@ -23,8 +23,8 @@ jobs:
       - name: unpack-repo-nuwen-mingw-subset
         shell: cmd
         run: |
-          echo "${{ runner.workspace }}\mingw-root"
-          start /b /wait ./mingw.exe -y -gm2 -InstallPath="${{ runner.workspace }}\mingw-root"
+          echo "${{ runner.workspace }}\\mingw"
+          start /b /wait ./mingw.exe -y -gm2 -InstallPath="${{ runner.workspace }}\\mingw"
       - uses: msys2/setup-msys2@v2
         with:
           msystem: mingw64

diff --git a/avr-gcc-100-12.3.0_x86_64-w64-mingw32.sh b/avr-gcc-100-12.3.0_x86_64-w64-mingw32.sh
@@ -34,11 +34,11 @@ cp ../avr-gcc-100-12.3.0_x86_64-w64-mingw32.patch .
 
 
 echo 'append standalone gcc-x86_64-w64-mingw32 path'
-PATH=$SCRIPT_DIR/mingw-root/bin:"$PATH"
+PATH=$SCRIPT_DIR/mingw/bin:"$PATH"
 export PATH
-C_INCLUDE_PATH=$SCRIPT_DIR/mingw-root/include
+C_INCLUDE_PATH=$SCRIPT_DIR/mingw/include
 export C_INCLUDE_PATH
-CPLUS_INCLUDE_PATH=$SCRIPT_DIR/mingw-root/include
+CPLUS_INCLUDE_PATH=$SCRIPT_DIR/mingw/include
 export CPLUS_INCLUDE_PATH