Search path environment variables for cross-compilers.  See the discussion
at <http://gcc.gnu.org/ml/gcc/2013-02/msg00124.html>.

Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed
at <http://bugs.gnu.org/22186>.

--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -461,8 +461,8 @@ register_include_chains (cpp_reader *pfile, const char *sysroot,
 			 int stdinc, int cxx_stdinc, int verbose)
 {
   static const char *const lang_env_vars[] =
-    { "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH",
-      "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" };
+    { "CROSS_C_INCLUDE_PATH", "CROSS_CPLUS_INCLUDE_PATH",
+      "CROSS_OBJC_INCLUDE_PATH", "CROSS_OBJCPLUS_INCLUDE_PATH" };
   cpp_options *cpp_opts = cpp_get_options (pfile);
   size_t idx = (cpp_opts->objc ? 2: 0);
 
@@ -473,7 +473,7 @@ register_include_chains (cpp_reader *pfile, const char *sysroot,
 
   /* CPATH and language-dependent environment variables may add to the
      include chain.  */
-  add_env_var_paths ("CPATH", BRACKET);
+  add_env_var_paths ("CROSS_CPATH", BRACKET);
   add_env_var_paths (lang_env_vars[idx], SYSTEM);
 
   target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc);
diff --git a/gcc/system.h b/gcc/system.h
index 42bc509..af3b9ad 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -1063,4 +1063,6 @@ helper_const_non_const_cast (const char *p)
 /* Get definitions of HOST_WIDE_INT and HOST_WIDEST_INT.  */
 #include "hwint.h"
 
+#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH"
+
 #endif /* ! GCC_SYSTEM_H */
diff --git a/gcc/tlink.c b/gcc/tlink.c
index bc358b8..ad6242f 100644
--- a/gcc/tlink.c
+++ b/gcc/tlink.c
@@ -458,7 +458,7 @@ recompile_files (void)
   file *f;
 
   putenv (xstrdup ("COMPILER_PATH="));
-  putenv (xstrdup ("LIBRARY_PATH="));
+  putenv (xstrdup (LIBRARY_PATH_ENV "="));
 
   while ((f = file_pop ()) != NULL)
     {
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 0f042b0..c23fb0b 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -4264,7 +4264,7 @@ process_command (unsigned int decoded_options_count,
     }
 
   temp = env.get (LIBRARY_PATH_ENV);
-  if (temp && *cross_compile == '0')
+  if (temp)
     {
       const char *startp, *endp;
       char *nstore = (char *) alloca (strlen (temp) + 3);
97e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/browser-extension/log/?h=v2.0-beta1&amp;id=830d22d8931a4e5f0606d401f24d7cd937f8697e'>root</a>/<a href='/browser-extension/log/common?h=v2.0-beta1&amp;id=830d22d8931a4e5f0606d401f24d7cd937f8697e'>common</a>/<a href='/browser-extension/log/common/message_server.js?h=v2.0-beta1&amp;id=830d22d8931a4e5f0606d401f24d7cd937f8697e'>message_server.js</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/browser-extension/log/common/message_server.js?h=v2.0-beta1&amp;id=830d22d8931a4e5f0606d401f24d7cd937f8697e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-29 00:04:44 +0100'>2022-01-29</span></td><td><a href='/browser-extension/commit/common/message_server.js?h=v2.0-beta1&amp;id=4c6a2323d90e9321ec2b78e226167b3013ea69ab'>make Haketilo buildable again (for Mozilla)</a><span class='msg-avail'>...</span></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-01-27 19:35:44 +0100'>2022-01-27</span></td><td><a href='/browser-extension/commit/common/message_server.js?h=v2.0-beta1&amp;id=5c58b3d65e370ebd3dadc1133157c73c6afc84af'>facilitate querying IndexedDB for script files of resource and its dependencies</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-01-04 09:15:32 +0100'>2022-01-04</span></td><td><a href='/browser-extension/commit/common/message_server.js?h=v2.0-beta1&amp;id=372d24ea3a52e376f953deeffeb7847d008b81c9'>fix license promise typo</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2021-12-27 16:55:28 +0100'>2021-12-27</span></td><td><a href='/browser-extension/commit/common/message_server.js?h=v2.0-beta1&amp;id=01e977f922ea29cd2994f96c18e4b3f033b1802d'>facilitate egistering dynamic content scripts with mappings data</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2021-12-22 16:39:34 +0100'>2021-12-22</span></td><td><a href='/browser-extension/commit/common/message_server.js?h=v2.0-beta1&amp;id=b590eaa2f64ead3384eadc6fe58f6358aa1a0478'>reworked build system; added missing license notices</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2021-10-30 00:00:00 +0000'>2021-10-30</span></td><td><a href='/browser-extension/commit/common/message_server.js?h=v2.0-beta1&amp;id=263d03d5a0b85874e988c9ea7373f9f9471ef1be'>Fix license notices on JS and SH files</a><span class='msg-avail'>...</span></td><td>jahoti</td></tr>
<tr><td><span title='2021-09-13 16:56:44 +0200'>2021-09-13</span></td><td><a href='/browser-extension/commit/common/message_server.js?h=v2.0-beta1&amp;id=2bd35bc4b0d32b70320b06d932db90e75e89373e'>rename the extension to "Haketilo"</a></td><td>Wojtek Kosior</td></tr>