# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1289684627 21600
# Node ID 5035607b3cda0d1b3c827b12433d017ce3ab4dda
# Parent  e5f98d48be156ee5f56cff7c2c4f1df4168a44fc
Rip out the code gratuitously reordering libraries.  It serves no purpose other than to break mixed -lblah and ../blah.a compiles that care about order.

diff -r e5f98d48be15 -r 5035607b3cda sources/toys/ccwrap.c
--- a/sources/toys/ccwrap.c	Thu Nov 11 06:37:04 2010 -0600
+++ b/sources/toys/ccwrap.c	Sat Nov 13 15:43:47 2010 -0600
@@ -115,8 +115,8 @@
 	int linking = 1, use_static_linking = 0, use_shared_libgcc;
 	int use_stdinc = 1, use_start = 1, use_stdlib = 1, use_shared = 0;
 	int source_count = 0, verbose = 0;
-	int i, argcnt, liblen, lplen;
-	char **cc_argv, **libraries, **libpath;
+	int i, argcnt, lplen;
+	char **cc_argv, **libpath;
 	char *dlstr;
 	char *cc, *toolprefix;
 	char *debug_wrapper=getenv("CCWRAP_DEBUG");
@@ -213,10 +213,6 @@
 	if (!dlstr) dlstr = "/lib/ld-uClibc.so.0";
 	asprintf(&dlstr, "-Wl,--dynamic-linker,%s", dlstr);
 
-	liblen = 0;
-	libraries = alloca(sizeof(char*) * (argc));
-	libraries[liblen] = 0;
-
 	lplen = 0;
 	libpath = alloca(sizeof(char*) * (argc));
 	libpath[lplen] = 0;
@@ -253,12 +249,6 @@
 					argv[i] = 0;
 					break;
 
-				case 'l': 		/* library */
-					libraries[liblen++] = argv[i];
-					libraries[liblen] = 0;
-					argv[i] = 0;
-					break;
-
 				case 'v':		/* verbose */
 					if (argv[i][2] == 0) verbose = 1;
 					printf("Invoked as %s\n", argv[0]);
@@ -406,7 +396,6 @@
 		// just to be safe:
 		asprintf(cc_argv+(argcnt++), "-Wl,-rpath-link,%s/lib", devprefix);
 
-
 		asprintf(cc_argv+(argcnt++), "-L%s/lib", devprefix);
 		asprintf(cc_argv+(argcnt++), "-L%s/cc/lib", devprefix);
 	}
@@ -444,11 +433,6 @@
 
 		for (i=1; i<argc; i++) if (argv[i]) cc_argv[argcnt++] = argv[i];
 
-		// Add shared libraries.
-
-		for (i = 0 ; i < liblen ; i++)
-			if (libraries[i]) cc_argv[argcnt++] = libraries[i];
-
 		// Add standard libraries
 
 		if (use_stdlib) {