diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 444560a4353..dd66a7cc52b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,21 +35,12 @@ jobs: - name: Set path for Rtools40 if: runner.os == 'Windows' run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - - name: Install mingw32-make and check toolchain path - if: runner.os == 'Windows' - run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm - g++ --version - Get-Command g++ | Select-Object -ExpandProperty Definition - mingw32-make --version - Get-Command mingw32-make | Select-Object -ExpandProperty Definition - shell: powershell - name: Build Math libs shell: powershell run: | Add-Content make\local "O=1`n" - mingw32-make -f make/standalone math-libs -j2 + make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -85,21 +76,12 @@ jobs: - name: Set path for Rtools40 if: runner.os == 'Windows' run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - - name: Install mingw32-make and check toolchain path - if: runner.os == 'Windows' - run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm - g++ --version - Get-Command g++ | Select-Object -ExpandProperty Definition - mingw32-make --version - Get-Command mingw32-make | Select-Object -ExpandProperty Definition - shell: powershell - name: Build Math libs shell: powershell run: | Add-Content make\local "O=1`n" - mingw32-make -f make/standalone math-libs -j2 + make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -139,21 +121,12 @@ jobs: - name: Set path for Rtools40 if: runner.os == 'Windows' run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - - name: Install mingw32-make and check toolchain path - if: runner.os == 'Windows' - run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm - g++ --version - Get-Command g++ | Select-Object -ExpandProperty Definition - mingw32-make --version - Get-Command mingw32-make | Select-Object -ExpandProperty Definition - shell: powershell - name: Build Math libs shell: powershell run: | Add-Content make\local "O=1`n" - mingw32-make -f make/standalone math-libs -j2 + make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 @@ -171,7 +144,7 @@ jobs: with: name: gtest_outputs_xml path: '**/*_test.xml' - + mix-fun-2: name: mix/fun tests 2 runs-on: windows-latest @@ -188,21 +161,12 @@ jobs: - name: Set path for Rtools40 if: runner.os == 'Windows' run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 - - name: Install mingw32-make and check toolchain path - if: runner.os == 'Windows' - run: | - pacman -Syu mingw-w64-x86_64-make --noconfirm - g++ --version - Get-Command g++ | Select-Object -ExpandProperty Definition - mingw32-make --version - Get-Command mingw32-make | Select-Object -ExpandProperty Definition - shell: powershell - name: Build Math libs shell: powershell run: | Add-Content make\local "O=1`n" - mingw32-make -f make/standalone math-libs -j2 + make -f make/standalone math-libs -j2 - name: Add TBB to PATH shell: powershell run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8 diff --git a/make/libraries b/make/libraries index e846161ee2a..0300edc9735 100644 --- a/make/libraries +++ b/make/libraries @@ -102,10 +102,6 @@ clean-sundials: # Note that the tbb targets must not be build in parallel (so no concurrent # build of tbb and tbbmalloc, for example). This is ensured here with proper # dependencies. -# -# On windows the mingw32-make (part of RTools, for example) is required to build -# the TBB as this make has proper POSIX extensions needed by the used downstream -# TBB makefiles. ifndef TBB_LIB