From 5bd272eb6bdd85c2de7ee1405058dbb0131b8beb Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 31 Dec 2010 08:39:02 -0300 Subject: [PATCH] gcc: install copies of libgcc, libstdc++ and libgcj to the sysroot We want to keep a copy around for the future SDK functionality. Also it's a better fix for bug #1051. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- toolchain/gcc/gcc-uclibc-4.x.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 0d6f2aec61..633b8aae87 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -423,6 +423,8 @@ $(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR3)/.installed ifeq ($(BR2_GCC_SHARED_LIBGCC),y) # These go in /lib, so... rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* + -cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcc_s* \ + $(STAGING_DIR)/lib/ -cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcc_s* \ $(TARGET_DIR)/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgcc_s* @@ -430,14 +432,20 @@ endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) ifeq ($(BR2_GCC_SHARED_LIBGCC),y) mkdir -p $(TARGET_DIR)/usr/lib + -cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libstdc++.so* \ + $(STAGING_DIR)/usr/lib/ -cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libstdc++.so* \ $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so* endif endif ifeq ($(BR2_INSTALL_LIBGCJ),y) + cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcj.so* $(STAGING_DIR)/usr/lib/ cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcj.so* $(TARGET_DIR)/usr/lib/ + mkdir -p $(STAGING_DIR)/usr/lib/security mkdir -p $(TARGET_DIR)/usr/lib/security + cp -dpf $(HOST_DIR)/usr/lib/security/classpath.security \ + $(STAGING_DIR)/usr/lib/security/ cp -dpf $(HOST_DIR)/usr/lib/security/classpath.security \ $(TARGET_DIR)/usr/lib/security/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgcj.so* -- 2.30.2