1.1 --- a/scripts/build/cc_gcc.sh	Sun Sep 16 17:59:18 2007 +0000
     1.2 +++ b/scripts/build/cc_gcc.sh	Thu Feb 14 22:44:34 2008 +0000
     1.3 @@ -278,27 +278,14 @@
     1.4      CT_DoLog EXTRA "Installing final compiler"
     1.5      make install 2>&1 |CT_DoLog ALL
     1.6  
     1.7 -    # FIXME: shouldn't people who want this just --disable-multilib in final gcc
     1.8 -    # and be done with it?
     1.9 -    # This code should probably be deleted, it was written long ago and hasn't
    1.10 -    # been tested in ages.
    1.11 -    # kludge: If the chip does not have a floating point unit
    1.12 -    # (i.e. if GLIBC_EXTRA_CONFIG contains --without-fp),
    1.13 -    # and there are shared libraries in /lib/nof, copy them to /lib
    1.14 -    # so they get used by default.
    1.15 -    # FIXME: only rs6000/powerpc seem to use nof.  See MULTILIB_DIRNAMES
    1.16 -    # in $GCC_DIR/gcc/config/$TARGET/* to see what your arch calls it.
    1.17 -    #case "${CT_LIBC_EXTRA_CONFIG}" in
    1.18 -    #    *--without-fp*)
    1.19 -    #        if test -d "${CT_SYSROOT_DIR}/lib/nof"; then
    1.20 -    #            cp -af "${CT_SYSROOT_DIR}/lib/nof/"*.so* "${CT_SYSROOT_DIR}/lib" || true
    1.21 -    #        fi
    1.22 -    #    ;;
    1.23 -    #esac
    1.24 -
    1.25      # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able
    1.26      # to call the C compiler with the same, somewhat canonical name.
    1.27      ln "${CT_PREFIX_DIR}/bin/${CT_TARGET}"-{g,}cc
    1.28  
    1.29 +    # gcc installs stuff in prefix/target/lib, when it would make better sense
    1.30 +    # to install that into sysroot/usr/lib
    1.31 +    CT_DoLog EXTRA "Moving improperly installed gcc libs to sysroot"
    1.32 +    ( cd "${CT_PREFIX_DIR}/${CT_TARGET}/lib"; tar cf - . ) | ( cd "${CT_SYSROOT_DIR}/usr/lib"; tar xfv - )
    1.33 +
    1.34      CT_EndStep
    1.35  }