# HG changeset patch
# User Marc Andre Tanner <mat@brain-dump.org>
# Date 1260566946 -3600
# Node ID 809d705262f8982aa61e440a2e4b30fb9e6f5aad
# Parent  61aa2ac67660ced2b6aa90f3626b3644b890e58a
Remove UCLIBC_GCC_{INC,LIB}

diff -r 61aa2ac67660 -r 809d705262f8 sources/toys/ccwrap.c
--- a/sources/toys/ccwrap.c	Fri Dec 11 00:21:46 2009 -0600
+++ b/sources/toys/ccwrap.c	Fri Dec 11 22:29:06 2009 +0100
@@ -116,7 +116,7 @@
 	int source_count = 0, verbose = 0;
 	int i, argcnt, liblen, lplen;
 	char **gcc_argv, **libraries, **libpath;
-	char *dlstr, *incstr, *devprefix, *libstr;
+	char *dlstr, *devprefix;
 	char *cc, *toolprefix;
 	char *debug_wrapper=getenv("WRAPPER_DEBUG");
 
@@ -199,8 +199,6 @@
 	}
 	if (!devprefix) devprefix = topdir;
 
-	incstr = getenv("UCLIBC_GCC_INC");
-	libstr = getenv("UCLIBC_GCC_LIB");
 
 	// Figure out where the dynamic linker is.
 	dlstr = getenv("UCLIBC_DYNAMIC_LINKER");
@@ -402,7 +400,6 @@
 		// just to be safe:
 		xasprintf(gcc_argv+(argcnt++), "-Wl,-rpath-link,%s/lib", devprefix);
 
-		if (libstr) gcc_argv[argcnt++] = libstr;
 
 		xasprintf(gcc_argv+(argcnt++), "-L%s/lib", devprefix);
 		xasprintf(gcc_argv+(argcnt++), "-L%s/cc/lib", devprefix);
@@ -420,7 +417,6 @@
 		xasprintf(gcc_argv+(argcnt++), "%s/include", devprefix);
 		gcc_argv[argcnt++] = "-isystem";
 		xasprintf(gcc_argv+(argcnt++), "%s/cc/include", devprefix);
-		if (incstr) gcc_argv[argcnt++] = incstr;
 	}
 
 	gcc_argv[argcnt++] = "-U__nptl__";