1.1 --- a/scripts/build/cc/gcc.sh Mon Feb 27 15:24:18 2012 +0800
1.2 +++ b/scripts/build/cc/gcc.sh Sun Jan 01 17:49:44 2012 +0100
1.3 @@ -71,7 +71,7 @@
1.4 core_opts+=( "mode=static" )
1.5 core_opts+=( "host=${CT_HOST}" )
1.6 core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
1.7 - core_opts+=( "prefix=${CT_CC_CORE_STATIC_PREFIX_DIR}" )
1.8 + core_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" )
1.9 core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
1.10 ;;
1.11 *)
1.12 @@ -100,12 +100,12 @@
1.13 # In case we're NPTL, build the shared core gcc and the target libgcc.
1.14 # In any other case, build the static core gcc and, if using gcc-4.3+,
1.15 # also build the target libgcc.
1.16 + core_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" )
1.17 case "${CT_BARE_METAL},${CT_CANADIAN},${CT_THREADS}" in
1.18 y,*,*)
1.19 do_core=y
1.20 core_opts+=( "host=${CT_HOST}" )
1.21 core_opts+=( "mode=static" )
1.22 - core_opts+=( "prefix=${CT_CC_CORE_STATIC_PREFIX_DIR}" )
1.23 core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
1.24 core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
1.25 ;;
1.26 @@ -116,7 +116,6 @@
1.27 core_opts+=( "host=${CT_HOST}" )
1.28 core_opts+=( "build_libgcc=yes" )
1.29 core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
1.30 - core_opts+=( "prefix=${CT_CC_CORE_SHARED_PREFIX_DIR}" )
1.31 core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
1.32 ;;
1.33 ,,win32)
1.34 @@ -125,7 +124,6 @@
1.35 core_opts+=( "host=${CT_HOST}" )
1.36 core_opts+=( "build_libgcc=yes" )
1.37 core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
1.38 - core_opts+=( "prefix=${CT_CC_CORE_STATIC_PREFIX_DIR}" )
1.39 core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
1.40 ;;
1.41 *)
1.42 @@ -133,7 +131,6 @@
1.43 core_opts+=( "mode=static" )
1.44 core_opts+=( "host=${CT_HOST}" )
1.45 core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
1.46 - core_opts+=( "prefix=${CT_CC_CORE_STATIC_PREFIX_DIR}" )
1.47 core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
1.48 if [ "${CT_CC_GCC_4_3_or_later}" = "y" ]; then
1.49 core_opts+=( "build_libgcc=yes" )