Use linke to build-time-tools, disable libssp which does not work for cross-compile

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index 3fd4e6f51537bc14dfd95d200f726d10c258b5ad..733dbe6badfa4f2229c992af4f1441031cc3c7c7 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -252,8 +252,8 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
                --enable-languages=$(GCC_CROSS_LANGUAGES) \
                --disable-__cxa_atexit \
                --enable-target-optspace \
-               --with-gnu-ld \
-               --with-as=$(TARGET_CROSS)as \
+               --with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
+               --disable-libssp \
                $(GCC_WITH_HOST_GMP) \
                $(GCC_WITH_HOST_MPFR) \
                $(GCC_SHARED_LIBGCC) \
@@ -355,13 +355,14 @@ endif
        touch $@
 
 cross_compiler:=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc
-cross_compiler gcc: uclibc-configured binutils gcc_initial \
-       $(LIBFLOAT_TARGET) uclibc \
-       $(GCC_BUILD_DIR2)/.installed $(GCC_BUILD_DIR2)/.libs_installed \
+cross_compiler gcc: gcc-config $(GCC_BUILD_DIR2)/.installed $(GCC_BUILD_DIR2)/.libs_installed \
        $(GCC_TARGETS)
 
 gcc-source: $(DL_DIR)/$(GCC_SOURCE)
 
+gcc-config:uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) \
+       uclibc $(GCC_BUILD_DIR2)/.configured
+
 gcc-clean:
        rm -rf $(GCC_BUILD_DIR2)
        for prog in cpp gcc gcc-[0-9]* protoize unprotoize gcov gccbug cc; do \