From bea0cde3051624261eff6e413a044161d581973a Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 10 Nov 2015 18:18:57 -0800 Subject: Support mingw-w64 in addToolVersion.sh. ... and add 4.0.4 release. Signed-off-by: Alexey Neyman --- scripts/addToolVersion.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 1ae47e84..37c3ae18 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -17,7 +17,8 @@ doHelp() { Usage: ${myname} <--tool> <[options] version [...]> ... 'tool' in one of: gcc, binutils, glibc, uClibc, newlib, linux, gdb, dmalloc, - duma, strace, ltrace, libelf, gmp, mpfr, ppl, cloog, mpc + duma, strace, ltrace, libelf, gmp, mpfr, ppl, cloog, mpc, + mingw-w64 Valid options for all tools: --stable, -s, +x (default) @@ -180,6 +181,7 @@ while [ $# -gt 0 ]; do --glibc) EXP=; OBS=; cat=LIBC_GLIBC; tool=glibc; tool_prefix=libc; dot2suffix=;; --uClibc) EXP=; OBS=; cat=LIBC_UCLIBC; tool=uClibc; tool_prefix=libc; dot2suffix=;; --newlib) EXP=; OBS=; cat=LIBC_NEWLIB; tool=newlib; tool_prefix=libc; dot2suffix=;; + --mingw-w64)EXP=; OBS=; cat=WINAPI; tool=mingw; tool_prefix=libc; dot2suffix=;; --linux) EXP=; OBS=; cat=KERNEL; tool=linux; tool_prefix=kernel; dot2suffix=;; --gdb) EXP=; OBS=; cat=GDB; tool=gdb; tool_prefix=debug; dot2suffix=;; --dmalloc) EXP=; OBS=; cat=DMALLOC; tool=dmalloc; tool_prefix=debug; dot2suffix=;; -- cgit v1.2.3 From f3e62e0c090aab6047037d3025de69bc8b5328f3 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 10 Nov 2015 18:21:43 -0800 Subject: Disable parallel build of mingw-w64-crt. Unfortunately, parallel build issue is not yet fixed in current mingw-w64 sources. Signed-off-by: Alexey Neyman --- scripts/build/libc/mingw.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index 26a00e09..19289dea 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -104,8 +104,11 @@ do_libc() { --build=${CT_BUILD} \ --host=${CT_TARGET} \ + # mingw-w64-crt has a missing dependency occasionally breaking the + # parallel build. See https://github.com/crosstool-ng/crosstool-ng/issues/246 + # Do not pass ${JOBSFLAGS} - build serially. CT_DoLog EXTRA "Building mingw-w64-crt" - CT_DoExecLog ALL make ${JOBSFLAGS} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing mingw-w64-crt" CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} -- cgit v1.2.3