From b181752a349c9d1da1f2234b04250a97bdda0e2d Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 20 Jul 2004 11:45:10 +0000
Subject: Install /lib/libgcc_s.so.1

---
 make/gcc-uclibc-3.3.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'make')

diff --git a/make/gcc-uclibc-3.3.mk b/make/gcc-uclibc-3.3.mk
index 13b4bf0c9..ec0e92734 100644
--- a/make/gcc-uclibc-3.3.mk
+++ b/make/gcc-uclibc-3.3.mk
@@ -173,12 +173,19 @@ ifeq ($(SOFT_FLOAT),true)
 		echo staging dir specs file is missing ; \
 		/bin/false ; \
 	fi;
-	cp $(SOURCE_DIR)/specs-$(ARCH)-soft-float $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
+	cp $(SOURCE_DIR)/specs-$(ARCH)-soft-float \
+		$(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
 endif
 	touch $(GCC_BUILD_DIR2)/.installed
 
+$(TARGET_DIR)/lib/libgcc_s.so.1: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s.so.1
+	# These are in /lib, so...
+	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/
+
 gcc3_3: uclibc-configured binutils gcc3_3_initial $(LIBFLOAT_TARGET) uclibc \
-	$(GCC_BUILD_DIR2)/.installed $(GCC_TARGETS)
+	$(TARGET_DIR)/lib/libgcc_s.so.1 $(GCC_BUILD_DIR2)/.installed $(GCC_TARGETS)
 
 gcc3_3-source: $(DL_DIR)/$(GCC_SOURCE)
 
-- 
cgit v1.2.3