mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-21 17:26:41 +00:00
/devel/gcc-4.4:
- gcc build script: no longer use the gcc-4.4 snapshot version -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/cc/gcc.sh | 33 13 20 0 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
This commit is contained in:
parent
51a84be902
commit
f149116490
@ -4,18 +4,16 @@
|
|||||||
|
|
||||||
# Download gcc
|
# Download gcc
|
||||||
do_cc_get() {
|
do_cc_get() {
|
||||||
local version="${CT_CC_VERSION}${CT_CC_GCC_4_4_snapshot_date}"
|
|
||||||
|
|
||||||
# Ah! gcc folks are kind of 'different': they store the tarballs in
|
# Ah! gcc folks are kind of 'different': they store the tarballs in
|
||||||
# subdirectories of the same name! That's because gcc is such /crap/ that
|
# subdirectories of the same name! That's because gcc is such /crap/ that
|
||||||
# it is such /big/ that it needs being splitted for distribution! Sad. :-(
|
# it is such /big/ that it needs being splitted for distribution! Sad. :-(
|
||||||
# Arrgghh! Some of those versions does not follow this convention:
|
# Arrgghh! Some of those versions does not follow this convention:
|
||||||
# gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a
|
# gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a
|
||||||
# subdirectory! You bastard!
|
# subdirectory! You bastard!
|
||||||
CT_GetFile "gcc-${version}" \
|
CT_GetFile "gcc-${CT_CC_VERSION}" \
|
||||||
{ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${version}} \
|
{ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${CT_CC_VERSION}} \
|
||||||
ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${version} \
|
ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${CT_CC_VERSION} \
|
||||||
ftp://ftp.uvsq.fr/pub/gcc/snapshots/${version}
|
ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION}
|
||||||
|
|
||||||
# Starting with GCC 4.3, ecj is used for Java, and will only be
|
# Starting with GCC 4.3, ecj is used for Java, and will only be
|
||||||
# built if the configure script finds ecj.jar at the top of the
|
# built if the configure script finds ecj.jar at the top of the
|
||||||
@ -29,16 +27,14 @@ do_cc_get() {
|
|||||||
|
|
||||||
# Extract gcc
|
# Extract gcc
|
||||||
do_cc_extract() {
|
do_cc_extract() {
|
||||||
local version="${CT_CC_VERSION}${CT_CC_GCC_4_4_snapshot_date}"
|
CT_Extract "gcc-${CT_CC_VERSION}"
|
||||||
|
CT_Patch "gcc-${CT_CC_VERSION}"
|
||||||
CT_Extract "gcc-${version}"
|
|
||||||
CT_Patch "gcc-${version}"
|
|
||||||
|
|
||||||
# Copy ecj-latest.jar to ecj.jar at the top of the GCC source tree
|
# Copy ecj-latest.jar to ecj.jar at the top of the GCC source tree
|
||||||
if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" \
|
if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" \
|
||||||
-a ! -f "${CT_SRC_DIR}/gcc-${version}/ecj.jar" \
|
-a ! -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/ecj.jar" \
|
||||||
]; then
|
]; then
|
||||||
CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/ecj-latest.jar" "${CT_SRC_DIR}/gcc-${version}/ecj.jar"
|
CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/ecj-latest.jar" "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/ecj.jar"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,7 +86,6 @@ do_cc_core() {
|
|||||||
local core_prefix_dir
|
local core_prefix_dir
|
||||||
local extra_config
|
local extra_config
|
||||||
local lang_opt
|
local lang_opt
|
||||||
local version="${CT_CC_VERSION}${CT_CC_GCC_4_4_snapshot_date}"
|
|
||||||
|
|
||||||
eval $1
|
eval $1
|
||||||
eval $2
|
eval $2
|
||||||
@ -150,7 +145,7 @@ do_cc_core() {
|
|||||||
CC_FOR_BUILD="${CT_BUILD}-gcc" \
|
CC_FOR_BUILD="${CT_BUILD}-gcc" \
|
||||||
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
|
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
|
||||||
CT_DoExecLog ALL \
|
CT_DoExecLog ALL \
|
||||||
"${CT_SRC_DIR}/gcc-${version}/configure" \
|
"${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/configure" \
|
||||||
--build=${CT_BUILD} \
|
--build=${CT_BUILD} \
|
||||||
--host=${CT_HOST} \
|
--host=${CT_HOST} \
|
||||||
--target=${CT_TARGET} \
|
--target=${CT_TARGET} \
|
||||||
@ -182,7 +177,7 @@ do_cc_core() {
|
|||||||
# so we configure then build it.
|
# so we configure then build it.
|
||||||
# Next we have to configure gcc, create libgcc.mk then edit it...
|
# Next we have to configure gcc, create libgcc.mk then edit it...
|
||||||
# So much easier if we just edit the source tree, but hey...
|
# So much easier if we just edit the source tree, but hey...
|
||||||
if [ ! -f "${CT_SRC_DIR}/gcc-${version}/gcc/BASE-VER" ]; then
|
if [ ! -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then
|
||||||
CT_DoExecLog ALL make configure-libiberty
|
CT_DoExecLog ALL make configure-libiberty
|
||||||
CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libiberty libiberty.a
|
CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libiberty libiberty.a
|
||||||
CT_DoExecLog ALL make configure-gcc configure-libcpp
|
CT_DoExecLog ALL make configure-gcc configure-libcpp
|
||||||
@ -192,7 +187,7 @@ do_cc_core() {
|
|||||||
CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp all-build-libiberty
|
CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp all-build-libiberty
|
||||||
fi
|
fi
|
||||||
# HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here.
|
# HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here.
|
||||||
if [ -d "${CT_SRC_DIR}/gcc-${version}/libdecnumber" ]; then
|
if [ -d "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/libdecnumber" ]; then
|
||||||
CT_DoExecLog ALL make configure-libdecnumber
|
CT_DoExecLog ALL make configure-libdecnumber
|
||||||
CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a
|
CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a
|
||||||
fi
|
fi
|
||||||
@ -238,8 +233,6 @@ do_cc_core() {
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# Build final gcc
|
# Build final gcc
|
||||||
do_cc() {
|
do_cc() {
|
||||||
local version="${CT_CC_VERSION}${CT_CC_GCC_4_4_snapshot_date}"
|
|
||||||
|
|
||||||
# If building for bare metal, nothing to be done here, the static core conpiler is enough!
|
# If building for bare metal, nothing to be done here, the static core conpiler is enough!
|
||||||
[ "${CT_BARE_METAL}" = "y" ] && return 0
|
[ "${CT_BARE_METAL}" = "y" ] && return 0
|
||||||
|
|
||||||
@ -296,7 +289,7 @@ do_cc() {
|
|||||||
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
|
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
|
||||||
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
|
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
|
||||||
CT_DoExecLog ALL \
|
CT_DoExecLog ALL \
|
||||||
"${CT_SRC_DIR}/gcc-${version}/configure" \
|
"${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/configure" \
|
||||||
--build=${CT_BUILD} \
|
--build=${CT_BUILD} \
|
||||||
--host=${CT_HOST} \
|
--host=${CT_HOST} \
|
||||||
--target=${CT_TARGET} \
|
--target=${CT_TARGET} \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user