1.1 --- a/scripts/build/cc/gcc.sh	Mon Jan 05 23:02:43 2009 +0000
     1.2 +++ b/scripts/build/cc/gcc.sh	Tue Jan 06 22:10:17 2009 +0000
     1.3 @@ -12,12 +12,24 @@
     1.4      # subdirectory! You bastard!
     1.5      CT_GetFile "gcc-${CT_CC_VERSION}"   \
     1.6                 {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${CT_CC_VERSION}}
     1.7 +    # Starting with GCC 4.3, ecj is used for Java, and will only be
     1.8 +    # built if the configure script finds ecj.jar at the top of the
     1.9 +    # GCC source tree, which will not be there unless we get it and
    1.10 +    # put it there ourselves
    1.11 +    if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then
    1.12 +        CT_GetFile ecj-latest .jar ftp://gcc.gnu.org/pub/java   \
    1.13 +                                   ftp://sourceware.org/pub/java
    1.14 +    fi
    1.15  }
    1.16  
    1.17  # Extract gcc
    1.18  do_cc_extract() {
    1.19      CT_Extract "gcc-${CT_CC_VERSION}"
    1.20      CT_Patch "gcc-${CT_CC_VERSION}"
    1.21 +    # Copy ecj-latest.jar to ecj.jar at the top of the GCC source tree
    1.22 +    if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then
    1.23 +        CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/ecj-latest.jar" "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/ecj.jar"
    1.24 +    fi
    1.25  }
    1.26  
    1.27  #------------------------------------------------------------------------------