Mercurial > hg > aboriginal

diff sources/toys/ccwrap.c @ 905:023b577fb865

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Break up sources/sections/binutils-gcc.sh into binutils, gcc, and ccwrap, plus more gcc->cc cleanup.
author Rob Landley <rob@landley.net>
date Sat, 28 Nov 2009 18:10:43 -0600
parents 626288dd5cf3
children 809d705262f8
line wrap: on
line diff
--- a/sources/toys/ccwrap.c	Thu Nov 26 14:53:29 2009 -0600
+++ b/sources/toys/ccwrap.c	Sat Nov 28 18:10:43 2009 -0600
@@ -317,15 +317,15 @@
 						// Find this entry in the library path.
 						for(itemp=0;;itemp++) {
 							if (itemp == lplen)
-								xasprintf(&temp, "%s/gcc/lib/%s", devprefix,
+								xasprintf(&temp, "%s/cc/lib/%s", devprefix,
 									temp2);
 							else if (itemp == lplen+1)
 								xasprintf(&temp, "%s/lib/%s", devprefix, temp2);
 
-							// This is so "include" finds the gcc internal
+							// This is so "include" finds the cc internal
 							// include dir.  The uClibc build needs this.
 							else if (itemp == lplen+2)
-								xasprintf(&temp, "%s/gcc/%s", devprefix, temp2);
+								xasprintf(&temp, "%s/cc/%s", devprefix, temp2);
 							else if (itemp == lplen+3) {
 								temp = temp2;
 								break;
@@ -405,7 +405,7 @@
 		if (libstr) gcc_argv[argcnt++] = libstr;
 
 		xasprintf(gcc_argv+(argcnt++), "-L%s/lib", devprefix);
-		xasprintf(gcc_argv+(argcnt++), "-L%s/gcc/lib", devprefix);
+		xasprintf(gcc_argv+(argcnt++), "-L%s/cc/lib", devprefix);
 	}
 	if (use_stdinc && source_count) {
 		gcc_argv[argcnt++] = nostdinc;
@@ -419,7 +419,7 @@
 		gcc_argv[argcnt++] = "-isystem";
 		xasprintf(gcc_argv+(argcnt++), "%s/include", devprefix);
 		gcc_argv[argcnt++] = "-isystem";
-		xasprintf(gcc_argv+(argcnt++), "%s/gcc/include", devprefix);
+		xasprintf(gcc_argv+(argcnt++), "%s/cc/include", devprefix);
 		if (incstr) gcc_argv[argcnt++] = incstr;
 	}
 
@@ -432,7 +432,7 @@
 
 		if (ctor_dtor) {
 			xasprintf(gcc_argv+(argcnt++), "%s/lib/crti.o", devprefix);
-			xasprintf(gcc_argv+(argcnt++), "%s/gcc/lib/crtbegin%s", devprefix,
+			xasprintf(gcc_argv+(argcnt++), "%s/cc/lib/crtbegin%s", devprefix,
 					use_shared ? "S.o" : use_static_linking ? "T.o" : ".o");
 		}
 		if (use_start && !profile)
@@ -460,7 +460,7 @@
 			//gcc_argv[argcnt++] = "-Wl,--end-group";
 		}
 		if (ctor_dtor) {
-			xasprintf(gcc_argv+(argcnt++), "%s/gcc/lib/crtend%s", devprefix,
+			xasprintf(gcc_argv+(argcnt++), "%s/cc/lib/crtend%s", devprefix,
 					use_shared ? "S.o" : ".o");
 			xasprintf(gcc_argv+(argcnt++), "%s/lib/crtn.o", devprefix);
 		}