Skip to content

Commit

Permalink
Merge pull request #677 from starg2/update-mingw-w64
Browse files Browse the repository at this point in the history 
Add mingw-w64 v12.0.0 etc
  • Loading branch information
@niXman
niXman authored Aug 23, 2024
2 parents 7d4bd8a + b93bd77 commit 518e2fd
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 35 deletions.
60 changes: 30 additions & 30 deletions .github/workflows/build_cmake.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,53 +12,53 @@ jobs:
config:
- {
name: "x86_64 posix seh msvcrt",
artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
}
- {
name: "x86_64 posix seh ucrt",
artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
}
- {
name: "x86_64 win32 seh msvcrt",
artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
}
- {
name: "x86_64 win32 seh ucrt",
artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
}
- {
name: "x86_64 mcf seh ucrt",
artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=mcf --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=mcf --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
}
- {
name: "i686 posix dwarf msvcrt",
artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
}
- {
name: "i686 posix dwarf ucrt",
artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
}
- {
name: "i686 win32 dwarf msvcrt",
artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat"
}
- {
name: "i686 win32 dwarf ucrt",
artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
}
- {
name: "i686 mcf dwarf ucrt",
artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v11-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=mcf --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v12-rev0.7z",
build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=mcf --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat"
}

steps:
Expand Down Expand Up @@ -114,43 +114,43 @@ jobs:
config:
- {
name: "x86_64 posix seh msvcrt",
artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v11-rev0.7z"
artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z"
}
- {
name: "x86_64 posix seh ucrt",
artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v11-rev0.7z"
artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v12-rev0.7z"
}
- {
name: "x86_64 win32 seh msvcrt",
artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v11-rev0.7z"
artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v12-rev0.7z"
}
- {
name: "x86_64 win32 seh ucrt",
artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v11-rev0.7z"
artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v12-rev0.7z"
}
- {
name: "x86_64 mcf seh ucrt",
artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v11-rev0.7z"
artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v12-rev0.7z"
}
- {
name: "i686 posix dwarf msvcrt",
artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v11-rev0.7z"
artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z"
}
- {
name: "i686 posix dwarf ucrt",
artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v11-rev0.7z"
artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v12-rev0.7z"
}
- {
name: "i686 win32 dwarf msvcrt",
artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v11-rev0.7z"
artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v12-rev0.7z"
}
- {
name: "i686 win32 dwarf ucrt",
artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v11-rev0.7z"
artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v12-rev0.7z"
}
- {
name: "i686 mcf dwarf ucrt",
artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v11-rev0.7z"
artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v12-rev0.7z"
}

needs: release
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ In order to use the scripts provided by the MinGW-W64 project it is needed:
--no-multilib - build GCC without multilib support (default for DWARF and SEH exception models).
--static-gcc - build static GCC.
--dyn-deps - build GCC with dynamically dependencies.
--rt-version=<v3..v11> - version of mingw-w64 runtime to build.
--rt-version=<v3..v12> - version of mingw-w64 runtime to build.
--rev=N - number of the build revision.
--with-testsuite - run testsuite for packages that contain flags for it.
--threads=<posix|win32> - used threads model.
Expand Down
26 changes: 23 additions & 3 deletions build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ readonly RUN_ARGS="$@"
echo " ada,c,c++,fortran,objc,obj-c++"
echo " --jobs=N - specifies number of parallel make threads (defaults to 4)"
echo " --rt-version=<version> - specifies mingw-w64 runtime version to build:"
echo " v3, v4, v5, v6, v7, v8, v9, v10, v11 and trunk - specifies specific branches in the git repo"
echo " v3.3.0, v4.0.6, v5.0.4, v6.0.0, v7.0.0, v8.0.2, v9.0.0, v10.0.0, v11.0.0 is a specific release versions, uses the tarball"
echo " v3, v4, v5, v6, v7, v8, v9, v10, v11, v12 and trunk - specifies specific branches in the git repo"
echo " v3.3.0, v4.0.6, v5.0.4, v5.0.5, v6.0.0, v6.0.1, v7.0.0, v8.0.2, v9.0.0, v10.0.0, v11.0.0, v11.0.1, v12.0.0 is a specific release versions, uses the tarball"
echo " --buildroot=<path> - specifies the build root directory (path without spaces)"
echo " --provided-toolchain=<path> - specifies the path (without spaces) with already existing local toolchain instead of download it"
echo " available: dwarf, seh, sjlj, dwarfseh (picks by architecture)"
Expand Down Expand Up @@ -320,8 +320,12 @@ while [[ $# > 0 ]]; do
RUNTIME_VERSION=v11
RUNTIME_BRANCH="v11.x"
;;
trunk)
v12)
RUNTIME_VERSION=v12
RUNTIME_BRANCH="v12.x"
;;
trunk)
RUNTIME_VERSION=v13
RUNTIME_BRANCH="master"
;;
v3.3.0)
Expand All @@ -336,10 +340,18 @@ while [[ $# > 0 ]]; do
RUNTIME_VERSION=v5.0.4
RUNTIME_BRANCH="release"
;;
v5.0.5)
RUNTIME_VERSION=v5.0.5
RUNTIME_BRANCH="release"
;;
v6.0.0)
RUNTIME_VERSION=v6.0.0
RUNTIME_BRANCH="release"
;;
v6.0.1)
RUNTIME_VERSION=v6.0.1
RUNTIME_BRANCH="release"
;;
v7.0.0)
RUNTIME_VERSION=v7.0.0
RUNTIME_BRANCH="release"
Expand All @@ -360,6 +372,14 @@ while [[ $# > 0 ]]; do
RUNTIME_VERSION=v11.0.0
RUNTIME_BRANCH="release"
;;
v11.0.1)
RUNTIME_VERSION=v11.0.1
RUNTIME_BRANCH="release"
;;
v12.0.0)
RUNTIME_VERSION=v12.0.0
RUNTIME_BRANCH="release"
;;
*)
die "Unsupported runtime version $RUNTIME_VERSION."
;;
Expand Down
2 changes: 1 addition & 1 deletion library/config.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ SHOW_LOG_ON_ERROR=yes

JOBS=4

RUNTIME_VERSION=v12
RUNTIME_VERSION=v13
RUNTIME_BRANCH="master"

CLANG_GCC_VERSION=gcc-4.9.3
Expand Down

0 comments on commit 518e2fd

Please sign in to comment.