diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build index 649b60a686..b8a45e3621 100755 --- a/packages/toolchain/lang/gcc-final/build +++ b/packages/toolchain/lang/gcc-final/build @@ -2,8 +2,7 @@ . config/options -$SCRIPTS/install ccache toolchain -$SCRIPTS/install binutils +$SCRIPTS/build binutils $SCRIPTS/build gmp $SCRIPTS/build mpfr $SCRIPTS/build mpc @@ -32,9 +31,6 @@ LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib" \ --with-libelf=$ROOT/$TOOLCHAIN \ --enable-languages=${TOOLCHAIN_LANGUAGES} \ --enable-__cxa_atexit \ - --enable-lto \ - --enable-gold=both/ld \ - --enable-plugin \ --disable-libada \ --enable-decimal-float \ --disable-libmudflap \ @@ -48,3 +44,7 @@ LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib" \ --disable-nls make + +make install +cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib + diff --git a/packages/toolchain/lang/gcc-final/install b/packages/toolchain/lang/gcc-final/install index de9218b921..02ca424fdf 100755 --- a/packages/toolchain/lang/gcc-final/install +++ b/packages/toolchain/lang/gcc-final/install @@ -2,14 +2,6 @@ . config/options -if [ "$2" = toolchain ]; then - make -C $BUILD/gcc*/objdir-$1 install - cp -PR $BUILD/gcc*/objdir-$1*/$TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* \ - $SYSROOT_PREFIX/usr/lib - $SCRIPTS/install ccache toolchain - exit 0 -fi - mkdir -p $INSTALL/usr/lib cp -PR $BUILD/gcc*/objdir-$1*/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib cp -PR $BUILD/gcc*/objdir-$1*/$TARGET_NAME/libgomp/.libs/libgomp.so* $INSTALL/usr/lib