--- gcc/c-incpath.c.orig	2009-02-14 20:17:54.000000000 -0800
+++ gcc/c-incpath.c	2013-01-11 01:23:23.000000000 -0800
@@ -179,7 +179,7 @@ add_standard_paths (const char *sysroot,
 	  char *str;
 
 	  /* Should this directory start with the sysroot?  */
-	  if (sysroot && p->add_sysroot)
+	  if (sysroot && p->add_sysroot && strstr(p->fname, "llvm-gcc42") == NULL)
             /* LLVM LOCAL begin sysroot */
 #ifdef ENABLE_LLVM
 	    str = TARGET_BUILD_SYSROOT_PATH(sysroot, p->fname);