ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-11 15:33:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #248 from stilor/mingw-parallel-issue

Browse Source 
Mingw issue with parallel build.
This commit is contained in:
Bryan Hundven 2015-11-10 23:16:10 -08:00
commit 83403825ee
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/libc/mingw.in
View File

@ -14,14 +14,18 @@ choice
bool bool
prompt "Windows API version" prompt "Windows API version"
# Don't remove next line
# CT_INSERT_VERSION_BELOW
config WINAPI_V_DEVEL config WINAPI_V_DEVEL
bool bool
prompt "devel" prompt "devel"
depends on EXPERIMENTAL depends on EXPERIMENTAL
# Don't remove next line
# CT_INSERT_VERSION_BELOW
config WINAPI_V_4_0_4
bool
prompt "4.0.4"
config WINAPI_V_4_0_2 config WINAPI_V_4_0_2
bool bool
prompt "4.0.2" prompt "4.0.2"
@ -59,9 +63,10 @@ endchoice
config WINAPI_VERSION config WINAPI_VERSION
string string
prompt "Windows API version" if WINAPI_V_select prompt "Windows API version" if WINAPI_V_select
default "devel" if WINAPI_V_DEVEL
# Don't remove next line # Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW # CT_INSERT_VERSION_STRING_BELOW
default "devel" if WINAPI_V_DEVEL default "4.0.4" if WINAPI_V_4_0_4
default "4.0.2" if WINAPI_V_4_0_2 default "4.0.2" if WINAPI_V_4_0_2
default "4.0.1" if WINAPI_V_4_0_1 default "4.0.1" if WINAPI_V_4_0_1
default "4.0.0" if WINAPI_V_4_0_0 default "4.0.0" if WINAPI_V_4_0_0

4
scripts/addToolVersion.sh
View File

@ -17,7 +17,8 @@ doHelp() {
Usage: ${myname} <--tool> <[options] version [...]> ... Usage: ${myname} <--tool> <[options] version [...]> ...
'tool' in one of: 'tool' in one of:
gcc, binutils, glibc, uClibc, newlib, linux, gdb, dmalloc, 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: Valid options for all tools:
--stable, -s, +x (default) --stable, -s, +x (default)
@ -180,6 +181,7 @@ while [ $# -gt 0 ]; do
--glibc) EXP=; OBS=; cat=LIBC_GLIBC; tool=glibc; tool_prefix=libc; dot2suffix=;; --glibc) EXP=; OBS=; cat=LIBC_GLIBC; tool=glibc; tool_prefix=libc; dot2suffix=;;
--uClibc) EXP=; OBS=; cat=LIBC_UCLIBC; tool=uClibc; 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=;; --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=;; --linux) EXP=; OBS=; cat=KERNEL; tool=linux; tool_prefix=kernel; dot2suffix=;;
--gdb) EXP=; OBS=; cat=GDB; tool=gdb; tool_prefix=debug; dot2suffix=;; --gdb) EXP=; OBS=; cat=GDB; tool=gdb; tool_prefix=debug; dot2suffix=;;
--dmalloc) EXP=; OBS=; cat=DMALLOC; tool=dmalloc; tool_prefix=debug; dot2suffix=;; --dmalloc) EXP=; OBS=; cat=DMALLOC; tool=dmalloc; tool_prefix=debug; dot2suffix=;;

5
scripts/build/libc/mingw.sh
View File

@ -104,8 +104,11 @@ do_libc() {
--build=${CT_BUILD} \ --build=${CT_BUILD} \
--host=${CT_TARGET} \ --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_DoLog EXTRA "Building mingw-w64-crt"
CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoExecLog ALL make
CT_DoLog EXTRA "Installing mingw-w64-crt" CT_DoLog EXTRA "Installing mingw-w64-crt"
CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR}