[uClibc-cvs] svn commit: trunk/uClibc++/bin

[gkajmowi at uclibc.org]

Author: gkajmowi
Date: 2005-06-02 01:14:02 -0600 (Thu, 02 Jun 2005)
New Revision: 10449

Log:
Changes made by Peter S. Mazinger

Modified:
   trunk/uClibc++/bin/Makefile


Changeset:
Modified: trunk/uClibc++/bin/Makefile
===================================================================
--- trunk/uClibc++/bin/Makefile	2005-06-02 06:46:02 UTC (rev 10448)
+++ trunk/uClibc++/bin/Makefile	2005-06-02 07:14:02 UTC (rev 10449)
@@ -29,6 +29,13 @@
 	echo "#!/bin/bash" > $(WRAPPER)
 	echo "" >> $(WRAPPER)
 	echo "OPTIONS=\"$(INITIALOPTIONS)\"" >> $(WRAPPER)
+	echo "if $(LD) --help | grep -q \"as-needed\"" >> $(WRAPPER)
+	echo 'then' >> $(WRAPPER)
+	echo '  LIBGCC_LIB="-Wl,--as-needed -lgcc_s -Wl,--no-as-needed"' >> $(WRAPPER)
+	echo 'else' >> $(WRAPPER)
+	echo '  LIBGCC_LIB="-lgcc_s"' >> $(WRAPPER)
+	echo 'fi' >> $(WRAPPER)
+	echo "" >> $(WRAPPER)
 	echo 'INCLIB="Y"' >> $(WRAPPER)
 	echo 'while [ -n "$$1" ]' >> $(WRAPPER)
 	echo 'do' >> $(WRAPPER)
@@ -37,11 +44,15 @@
 	echo '	then' >> $(WRAPPER)
 	echo '		INCLIB="N"' >> $(WRAPPER)
 	echo '	fi' >> $(WRAPPER)
+	echo '	if [ "$$1" == "-static" ]' >> $(WRAPPER)
+	echo '	then' >> $(WRAPPER)
+	echo '		LIBGCC_LIB="-lgcc"' >> $(WRAPPER)
+	echo '	fi' >> $(WRAPPER)
 	echo '	shift' >> $(WRAPPER)
 	echo 'done' >> $(WRAPPER)
 	echo 'if [ "$$INCLIB" == "Y" ]' >> $(WRAPPER)
 	echo 'then' >> $(WRAPPER)
-	echo '	OPTIONS="$$OPTIONS -luClibc++ $(EXTRALIBS) -lc"' >> $(WRAPPER)
+	echo '	OPTIONS="$$OPTIONS -luClibc++ $(EXTRALIBS) -lc $$LIBGCC_LIB"' >> $(WRAPPER)
 	echo 'fi' >> $(WRAPPER)
 	echo -n "exec $(CXX) " >> $(WRAPPER)
 	echo -n ' -fno-builtin -nostdinc++ -nodefaultlibs' >> $(WRAPPER)