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>.

diff --git a/gcc/gcc.cc b/gcc/gcc.cc
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -4832,7 +4832,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);
diff --git a/gcc/incpath.cc b/gcc/incpath.cc
--- a/gcc/incpath.cc
+++ b/gcc/incpath.cc
@@ -480,8 +480,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);
 
@@ -492,7 +492,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", INC_BRACKET);
+  add_env_var_paths ("CROSS_CPATH", INC_BRACKET);
   add_env_var_paths (lang_env_vars[idx], INC_SYSTEM);
 
   target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc);
diff --git a/gcc/system.h b/gcc/system.h
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -1317,4 +1317,6 @@ endswith (const char *str, const char *suffix)
   return memcmp (str + str_len - suffix_len, suffix, suffix_len) == 0;
 }
 
+#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH"
+
 #endif /* ! GCC_SYSTEM_H */
-- 
2.36.1

ype='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=71e1d0a4373f6cc5cd99e1400fb87d64d97c370f'>root</a>/<a href='/guix/log/gnu?id=71e1d0a4373f6cc5cd99e1400fb87d64d97c370f'>gnu</a>/<a href='/guix/log/gnu/packages?id=71e1d0a4373f6cc5cd99e1400fb87d64d97c370f'>packages</a>/<a href='/guix/log/gnu/packages/libbsd.scm?id=71e1d0a4373f6cc5cd99e1400fb87d64d97c370f'>libbsd.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/libbsd.scm?id=71e1d0a4373f6cc5cd99e1400fb87d64d97c370f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
t'>Author</th></tr>
<tr><td><span title='2024-08-28 11:02:29 +0800'>2024-08-28</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=4c49cd171e2aa06af05cf52403050b18f100867a'>gnu: xa: Fix cross-compilation.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-08-28 11:01:27 +0800'>2024-08-28</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=6f593f1a0ebe3800195a775542d97714274ced36'>gnu: xa: Enable tests.</a><span class='msg-avail'>...</span></td><td>Artyom V. Poptsov</td></tr>
<tr><td><span title='2024-08-28 10:55:10 +0800'>2024-08-28</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=128d0b2ae0e99091fac10dde0282aa81e4a9584e'>gnu: xa: Update to 2.4.1.</a><span class='msg-avail'>...</span></td><td>Artyom V. Poptsov</td></tr>
<tr><td><span title='2024-08-14 10:56:52 +0100'>2024-08-14</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=e320ed57204363625dc1eb1e393f8535020087e0'>gnu: cpu-features: Fix cross-compilation.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-06-26 16:28:18 +0200'>2024-06-26</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=8c9902b131e06b1b0645698135fdabeacb381983'>gnu: Add cpu-features.</a><span class='msg-avail'>...</span></td><td>Andy Tai</td></tr>
<tr><td><span title='2024-06-24 08:51:43 -0400'>2024-06-24</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=1724d0f169a2ee108e6e3e04a24b091ac626e7b2'>gnu: rgbds: Update to 0.7.0.</a><span class='msg-avail'>...</span></td><td>Felix Gruber</td></tr>
<tr><td><span title='2024-06-20 01:41:55 -0500'>2024-06-20</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=b0a087e1b038d7bda5025e9c859e1f4471aa6b13'>gnu: simde: Update to 0.8.2.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>
<tr><td><span title='2024-06-02 12:05:09 +0200'>2024-06-02</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=e170c51404846471c83756f448e693fb6f9ad027'>gnu: asl: Update to 1.42-beta-267.</a><span class='msg-avail'>...</span></td><td>Simon South</td></tr>
<tr><td><span title='2023-09-27 23:58:38 +0200'>2023-09-27</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=d0d6851d852b15c657af5532d6a95a75e952e012'>gnu: Add blinkenlights.</a><span class='msg-avail'>...</span></td><td>B. Wilson</td></tr>
<tr><td><span title='2023-09-18 23:37:48 +0200'>2023-09-18</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=3d8d67ef6928f5d81118c97f03372cd341eab8b0'>gnu: Add asl.</a><span class='msg-avail'>...</span></td><td>Simon South</td></tr>
<tr><td><span title='2023-09-10 02:00:00 +0200'>2023-09-10</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=059d604ddf2a6bd40b21be842752157c27a16eb0'>gnu: lightning: Update to 2.2.2.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-08-28 18:12:06 +0800'>2023-08-28</span></td><td><a href='/guix/commit/gnu/packages/assembly.scm?id=4a49a89b09d07d96f4d6ef3c0ca93801370f7b20'>gnu: intel-xed: Update to 2023.08.21.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>