use octave 8 bundled gcc

fangq · Sep 10, 2023 · c25420d · c25420d
1 parent 22a618a
commit c25420d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -43,7 +43,6 @@ jobs:
         if: ${{ runner.os == 'Windows' }}
         run: |
           choco install octave.portable --version=8.3.0
-          mv /c/ProgramData/Chocolatey/lib/octave.portable/tools/octave/mingw64/include/omp.h /c/ProgramData/Chocolatey/lib/octave.portable/tools/octave/mingw64/include/omp_old.h
           echo 'C:\ProgramData\chocolatey\lib\octave.portable\tools\octave\mingw64\bin' >> $GITHUB_PATH
           echo 'C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\bin\' >> $GITHUB_PATH
           echo 'MW_MINGW64_LOC=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/' >> $GITHUB_ENV
@@ -79,6 +78,9 @@ jobs:
             make oct CC=gcc-11 CXX=g++-11 USEROCTOPT="CXXFLAGS='-pipe -Os -arch x86_64' DL_LD=g++ DL_LDFLAGS='-fopenmp -static-libgcc -static-libstdc++'"
             otool -L ../mmclab/mmc.mex
           else
+            export PATH='/c/ProgramData/chocolatey/lib/octave.portable/tools/octave/mingw64/bin':$PATH
+            which g++
+            g++ --version
             make oct CC=gcc CXX=g++ LIBOPENCL='/c/Windows/System32/OpenCL.dll --verbose' LFLAGS='-static-libgcc -static-libstdc++'
             objdump -p ../mmclab/mmc.mex | grep "DLL Name:"
           fi