1.1 --- a/scripts/build/cc/gcc.sh Mon Apr 02 22:54:30 2012 +0200
1.2 +++ b/scripts/build/cc/gcc.sh Tue May 08 18:31:10 2012 +0200
1.3 @@ -76,13 +76,10 @@
1.4 local -a core_opts
1.5 local do_core
1.6
1.7 - # Do nothing for canadian-crosses, we already have a target compiler.
1.8 # We only need a pass-1 core gcc if the threading model is NPTL.
1.9 # For all other cases, it is not used.
1.10 - case "${CT_CANADIAN},${CT_THREADS}" in
1.11 - y,*)
1.12 - ;;
1.13 - ,nptl)
1.14 + case "${CT_THREADS}" in
1.15 + nptl)
1.16 do_core=y
1.17 core_opts+=( "mode=static" )
1.18 core_opts+=( "host=${CT_BUILD}" )
1.19 @@ -116,21 +113,18 @@
1.20 core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
1.21 core_opts+=( "lang_list=c" )
1.22
1.23 - # Do nothing for canadian-crosses, we already have a target compiler.
1.24 # Different conditions are at stake here:
1.25 # - In case the threading model is NPTL, we need a shared-capable core
1.26 # gcc; in all other cases, we need a static-only core gcc.
1.27 # - In case the threading model is NPTL or win32, or gcc is 4.3 or
1.28 # later, we need to build libgcc
1.29 - case "${CT_CANADIAN},${CT_THREADS}" in
1.30 - y,*)
1.31 - ;;
1.32 - ,nptl)
1.33 + case "${CT_THREADS}" in
1.34 + nptl)
1.35 do_core=y
1.36 core_opts+=( "mode=shared" )
1.37 core_opts+=( "build_libgcc=yes" )
1.38 ;;
1.39 - ,win32)
1.40 + win32)
1.41 do_core=y
1.42 core_opts+=( "mode=static" )
1.43 core_opts+=( "build_libgcc=yes" )