Skip to content

Add support for GCC 13 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- windows-2022
- windows-2019
toolchain:
- {compiler: gcc, version: 13}
- {compiler: gcc, version: 12}
- {compiler: gcc, version: 11}
- {compiler: gcc, version: 10}
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,12 @@ jobs:
- *intel* (for `ifx`)
- *intel-classic* (for `ifort`)
- *version*: Version of the compiler toolchain, available options are
- *5–12* for *gcc*
- *5–13* for *gcc*
- *2021.1–2023.1* for *intel*
- *2021.1–2021.9* for *intel-classic*

**Note:** version 13 of the GNU toolchain is not yet available on Windows.


## Outputs

Expand Down
42 changes: 1 addition & 41 deletions setup-fortran.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install_gcc_brew()
ln -fs /usr/local/bin/g++-${version} /usr/local/bin/g++

# link lib dir for previous GCC versions to avoid missing .dylib issues
for (( i=12; i>4; i-- ))
for (( i=13; i>4; i-- ))
do
gcc_lib_path="/usr/local/opt/gcc/lib/gcc/$i"
if [ -d $gcc_lib_path ]; then
Expand Down Expand Up @@ -92,46 +92,6 @@ install_gcc_choco()
fi
}

install_gcc_winlibs()
{
repo="https://github.com/brechtsanders/winlibs_mingw/releases/download"
case $version in
12)
tag="12.2.0-14.0.6-10.0.0-ucrt-r2"
zip="winlibs-x86_64-posix-seh-gcc-12.2.0-mingw-w64ucrt-10.0.0-r2.zip"
;;
11)
tag="11.2.0-12.0.1-9.0.0-r1"
zip="winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64-9.0.0-r1.zip"
;;
10)
tag="10.3.0-12.0.0-9.0.0-r2"
zip="winlibs-x86_64-posix-seh-gcc-10.3.0-mingw-w64-9.0.0-r2.zip"
;;
9)
tag="9.4.0-9.0.0-r1"
zip="winlibs-x86_64-posix-seh-gcc-9.4.0-mingw-w64-9.0.0-r1.zip"
;;
8)
tag="8.5.0-9.0.0-r1"
zip="winlibs-x86_64-posix-seh-gcc-8.5.0-mingw-w64-9.0.0-r1.zip"
;;
*)
echo "Unsupported version: $version (choose 8-12)"
exit 1
;;
esac

require_fetch
$fetch "$repo/$tag/$zip" > gcc.zip

unzip -qo gcc.zip "mingw64/bin/*" -d /

export FC="gfortran"
export CC="gcc"
export CXX="g++"
}

install_gcc()
{
local platform=$1
Expand Down