From 243e4edc748b26f9a713bc268e5b7a6ff7d15956 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 13 Apr 2011 13:29:28 -0300 Subject: [PATCH] toolchain: make target gcc a working option Make target gcc a more usable option. * Nuke duplicate libgcc_s*.so* in /usr/lib since it confuses target gcc * Copy *crt*.o files to the target system to unbreak gcc Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- toolchain/gcc/gcc-uclibc-4.x.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 96bebd616c..04b21e9f11 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -550,12 +550,17 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled cp -f $(HOST_DIR)/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h \ $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/; \ fi + # Make sure we have 'cc'. if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \ ln -snf gcc $(TARGET_DIR)/usr/bin/cc; \ fi + + # Copy C runtime initialization object files + cp -f $(STAGING_DIR)/usr/lib/*crt*.o $(TARGET_DIR)/usr/lib + # These are in /lib, so... - #rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* + rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* touch -c $@ gcc_target: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ) binutils $(TARGET_DIR)/usr/bin/gcc