revert back to the link mingw gcc to msys

fangq · Mar 14, 2023 · d760692 · d760692
1 parent 0890cea
commit d760692
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -43,15 +43,6 @@ jobs:
           echo 'C:\ProgramData\chocolatey\lib\octave.portable\tools\octave\mingw64\bin' | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo 'C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\bin\' | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo 'MW_MINGW64_LOC=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      - name: Install msys2 libraries (Windows only)
-        if: ${{ runner.os == 'Windows' }}
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: >-
-            base-devel
-            gcc
-            zlib-devel
       - name: Install OpenCL.dll and static libraries (Windows only)
         if: ${{ runner.os == 'Windows' }}
         run: |
@@ -62,6 +53,11 @@ jobs:
           cp bin/OpenCL.dll 'c:\Windows\System32'
           cd ..
           rm -rf opencl
+          ln -s /c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/gcc.exe /c/msys64/usr/bin/
+          ln -s /c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/gcc.exe /c/msys64/usr/bin/cc.exe
+          ln -s /c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/g++.exe /c/msys64/usr/bin/
+          ln -s /c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/c++.exe /c/msys64/usr/bin/
+          ls /c/msys64/usr/bin
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v1
       - name: Update RCS keywords
@@ -92,7 +88,7 @@ jobs:
           cd src
           if [[ "$RUNNER_OS" == "Windows" ]]; then
             env
-            make mex USERARFLAGS="-Lc:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/x86_64-w64-mingw32/lib -Lc:/ghcup/ghc/9.0.2/mingw/lib -Lc:/ghcup/ghc/9.0.2/mingw/x86_64-w64-mingw32/lib libzmat.a -lz -v"
+            make mex USERARFLAGS="-Lc:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/x86_64-w64-mingw32/lib -Lc:/ghcup/ghc/9.0.2/mingw/lib -Ic:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/include libzmat.a -lz -v"
             objdump -p ../mmclab/mmc.mexw* | grep "DLL Name:"
           elif [[ "$RUNNER_OS" == "macOS" ]]; then
             which mex