1.1 --- a/scripts/build/cc_gcc.sh Sun Jul 13 10:32:38 2008 +0000
1.2 +++ b/scripts/build/cc_gcc.sh Sun Jul 27 14:28:36 2008 +0000
1.3 @@ -71,6 +71,7 @@
1.4 # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
1.5 CC_FOR_BUILD="${CT_CC_NATIVE}" \
1.6 CFLAGS="${CT_CFLAGS_FOR_HOST}" \
1.7 + CT_DoExecLog ALL \
1.8 "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \
1.9 ${CT_CANADIAN_OPT} \
1.10 --host=${CT_HOST} \
1.11 @@ -87,18 +88,18 @@
1.12 --enable-languages=c \
1.13 --disable-shared \
1.14 --enable-target-optspace \
1.15 - ${CT_CC_CORE_EXTRA_CONFIG} 2>&1 |CT_DoLog ALL
1.16 + ${CT_CC_CORE_EXTRA_CONFIG}
1.17
1.18 if [ "${CT_CANADIAN}" = "y" ]; then
1.19 CT_DoLog EXTRA "Building libiberty"
1.20 - make ${PARALLELMFLAGS} all-build-libiberty 2>&1 |CT_DoLog ALL
1.21 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty
1.22 fi
1.23
1.24 CT_DoLog EXTRA "Building static core C compiler"
1.25 - make ${PARALLELMFLAGS} all-gcc 2>&1 |CT_DoLog ALL
1.26 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-gcc
1.27
1.28 CT_DoLog EXTRA "Installing static core C compiler"
1.29 - make install-gcc 2>&1 |CT_DoLog ALL
1.30 + CT_DoExecLog ALL make install-gcc
1.31
1.32 CT_EndStep
1.33 }
1.34 @@ -129,6 +130,7 @@
1.35
1.36 CC_FOR_BUILD="${CT_CC_NATIVE}" \
1.37 CFLAGS="${CT_CFLAGS_FOR_HOST}" \
1.38 + CT_DoExecLog ALL \
1.39 "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \
1.40 ${CT_CANADIAN_OPT} \
1.41 --target=${CT_TARGET} \
1.42 @@ -143,7 +145,7 @@
1.43 --enable-languages=c \
1.44 --enable-shared \
1.45 --enable-target-optspace \
1.46 - ${CT_CC_CORE_EXTRA_CONFIG} 2>&1 |CT_DoLog ALL
1.47 + ${CT_CC_CORE_EXTRA_CONFIG}
1.48
1.49 # HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or
1.50 # gcc/config/t-libunwind so -lc is removed from the link for
1.51 @@ -162,36 +164,32 @@
1.52 # Next we have to configure gcc, create libgcc.mk then edit it...
1.53 # So much easier if we just edit the source tree, but hey...
1.54 if [ ! -f "${CT_SRC_DIR}/${CT_CC_FILE}/gcc/BASE-VER" ]; then
1.55 - make configure-libiberty
1.56 - make ${PARALLELMFLAGS} -C libiberty libiberty.a
1.57 - make configure-gcc
1.58 - make configure-libcpp
1.59 - make ${PARALLELMFLAGS} all-libcpp
1.60 + CT_DoExecLog ALL make configure-libiberty
1.61 + CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libiberty libiberty.a
1.62 + CT_DoExecLog ALL make configure-gcc configure-libcpp
1.63 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp
1.64 else
1.65 - make configure-gcc
1.66 - make configure-libcpp
1.67 - make configure-build-libiberty
1.68 - make ${PARALLELMFLAGS} all-libcpp
1.69 - make ${PARALLELMFLAGS} all-build-libiberty
1.70 - fi 2>&1 |CT_DoLog ALL
1.71 + CT_DoExecLog ALL make configure-gcc configure-libcpp configure-build-libiberty
1.72 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp all-build-libiberty
1.73 + fi
1.74 # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here.
1.75 if [ -d "${CT_SRC_DIR}/${CT_CC_FILE}/libdecnumber" ]; then
1.76 - make configure-libdecnumber
1.77 - make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a
1.78 - fi 2>&1 |CT_DoLog ALL
1.79 - make -C gcc libgcc.mk 2>&1 |CT_DoLog ALL
1.80 + CT_DoExecLog ALL make configure-libdecnumber
1.81 + CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a
1.82 + fi
1.83 + CT_DoExecLog ALL make -C gcc libgcc.mk
1.84 sed -r -i -e 's@-lc@@g' gcc/libgcc.mk
1.85
1.86 if [ "${CT_CANADIAN}" = "y" ]; then
1.87 CT_DoLog EXTRA "Building libiberty"
1.88 - make ${PARALLELMFLAGS} all-build-libiberty 2>&1 |CT_DoLog ALL
1.89 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty
1.90 fi
1.91
1.92 CT_DoLog EXTRA "Building shared core C compiler"
1.93 - make ${PARALLELMFLAGS} all-gcc 2>&1 |CT_DoLog ALL
1.94 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-gcc
1.95
1.96 CT_DoLog EXTRA "Installing shared core C compiler"
1.97 - make install-gcc 2>&1 |CT_DoLog ALL
1.98 + CT_DoExecLog ALL make install-gcc
1.99
1.100 CT_EndStep
1.101 }
1.102 @@ -244,6 +242,7 @@
1.103 CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
1.104 CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
1.105 LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
1.106 + CT_DoExecLog ALL \
1.107 "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \
1.108 ${CT_CANADIAN_OPT} \
1.109 --target=${CT_TARGET} --host=${CT_HOST} \
1.110 @@ -257,11 +256,11 @@
1.111 --enable-c99 \
1.112 --enable-long-long \
1.113 --enable-target-optspace \
1.114 - ${CT_CC_EXTRA_CONFIG} 2>&1 |CT_DoLog ALL
1.115 + ${CT_CC_EXTRA_CONFIG}
1.116
1.117 if [ "${CT_CANADIAN}" = "y" ]; then
1.118 CT_DoLog EXTRA "Building libiberty"
1.119 - make ${PARALLELMFLAGS} all-build-libiberty 2>&1 |CT_DoLog ALL
1.120 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty
1.121 fi
1.122
1.123 # Idea from <cort.dougan at gmail.com>:
1.124 @@ -285,14 +284,14 @@
1.125 esac
1.126
1.127 CT_DoLog EXTRA "Building final compiler"
1.128 - make ${PARALLELMFLAGS} all 2>&1 |CT_DoLog ALL
1.129 + CT_DoExecLog ALL make ${PARALLELMFLAGS} all
1.130
1.131 CT_DoLog EXTRA "Installing final compiler"
1.132 - make install 2>&1 |CT_DoLog ALL
1.133 + CT_DoExecLog ALL make install
1.134
1.135 # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able
1.136 # to call the C compiler with the same, somewhat canonical name.
1.137 - ln "${CT_PREFIX_DIR}/bin/${CT_TARGET}"-{g,}cc
1.138 + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}"-{g,}cc 2>&1 |CT_DoLog ALL
1.139
1.140 # gcc installs stuff in prefix/target/lib, when it would make better sense
1.141 # to install that into sysroot/usr/lib