<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">--- gcc/c-incpath.c.orig	2012-04-27 11:33:12.000000000 -0700
+++ gcc/c-incpath.c	2012-04-27 11:34:17.000000000 -0700
@@ -164,7 +164,7 @@ add_standard_paths (const char *sysroot,
 	  char *str;
 
 	  /* Should this directory start with the sysroot?  */
-	  if (sysroot &amp;&amp; p-&gt;add_sysroot)
+	  if (sysroot &amp;&amp; p-&gt;add_sysroot &amp;&amp; strstr(p-&gt;fname, "apple-gcc42") == NULL)
 	    str = concat (sysroot, p-&gt;fname, NULL);
 	  else
 	    str = update_path (p-&gt;fname, p-&gt;component);
</pre></body></html>