1.1 --- a/scripts/build/cc_gcc.sh Mon Jul 14 15:56:57 2008 +0000
1.2 +++ b/scripts/build/cc_gcc.sh Thu Jul 24 16:57:03 2008 +0000
1.3 @@ -177,8 +177,26 @@
1.4 CT_DoExecLog ALL make configure-libdecnumber
1.5 CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a
1.6 fi
1.7 - CT_DoExecLog ALL make -C gcc libgcc.mk
1.8 - sed -r -i -e 's@-lc@@g' gcc/libgcc.mk
1.9 +
1.10 + # Starting with GCC 4.3, libgcc.mk is no longer built,
1.11 + # and libgcc.mvars is used instead.
1.12 +
1.13 + gcc_version_major=$(echo ${CT_CC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/')
1.14 + gcc_version_minor=$(echo ${CT_CC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/')
1.15 +
1.16 + if [ ${gcc_version_major} -eq 4 -a ${gcc_version_minor} -ge 3 \
1.17 + -o ${gcc_version_major} -gt 4 ]; then
1.18 + libgcc_rule="libgcc.mvars"
1.19 + build_rules="all-gcc all-target-libgcc"
1.20 + install_rules="install-gcc install-target-libgcc"
1.21 + else
1.22 + libgcc_rule="libgcc.mk"
1.23 + build_rules="all-gcc"
1.24 + install_rules="install-gcc"
1.25 + fi
1.26 +
1.27 + CT_DoExecLog ALL make -C gcc ${libgcc_rule}
1.28 + sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule}
1.29
1.30 if [ "${CT_CANADIAN}" = "y" ]; then
1.31 CT_DoLog EXTRA "Building libiberty"
1.32 @@ -186,10 +204,10 @@
1.33 fi
1.34
1.35 CT_DoLog EXTRA "Building shared core C compiler"
1.36 - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-gcc
1.37 + CT_DoExecLog ALL make ${PARALLELMFLAGS} ${build_rules}
1.38
1.39 CT_DoLog EXTRA "Installing shared core C compiler"
1.40 - CT_DoExecLog ALL make install-gcc
1.41 + CT_DoExecLog ALL make ${install_rules}
1.42
1.43 CT_EndStep
1.44 }