[uClibc-cvs] svn commit: trunk/buildroot/toolchain/gcc

[andersen at uclibc.org]

Author: andersen
Date: 2005-03-02 00:07:22 -0700 (Wed, 02 Mar 2005)
New Revision: 9952

Log:
teach BR2_INSTALL_LIBSTDCPP to actually install libstdc++


Modified:
   trunk/buildroot/toolchain/gcc/gcc-uclibc-3.x.mk


Changeset:
Modified: trunk/buildroot/toolchain/gcc/gcc-uclibc-3.x.mk
===================================================================
--- trunk/buildroot/toolchain/gcc/gcc-uclibc-3.x.mk	2005-03-02 04:10:46 UTC (rev 9951)
+++ trunk/buildroot/toolchain/gcc/gcc-uclibc-3.x.mk	2005-03-02 07:07:22 UTC (rev 9952)
@@ -49,10 +49,6 @@
 endif
 endif
 
-ifeq ($(BR2_INSTALL_OBJC),y)
-TARGET_LANGUAGES:=$(TARGET_LANGUAGES),objc
-endif
-
 #############################################################
 #
 # build the first pass gcc compiler
@@ -136,7 +132,7 @@
 
 #############################################################
 #
-# second pass compiler build.  Build the compiler targeting 
+# second pass compiler build.  Build the compiler targeting
 # the newly built shared uClibc library.
 #
 #############################################################
@@ -219,6 +215,17 @@
 	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s.so*
 	-$(STRIP) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s.so.1
 	-cp -a $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+	-cp -a $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/lib/
+endif
+ifeq ($(BR2_INSTALL_LIBGCJ),y)
+	-cp -a $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/
+	-cp -a $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/
+	-cp -a $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/
+	-mkdir -p $(TARGET_DIR)/usr/lib/security
+	-cp -a $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/
+	-cp -a $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/
+endif
 
 gcc: uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) uclibc \
 	$(TARGET_DIR)/lib/libgcc_s.so.1 $(GCC_BUILD_DIR2)/.installed $(GCC_TARGETS)