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.c b/gcc/gcc.c
index eced0d5..08dec2b 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -4317,7 +4317,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.c b/gcc/incpath.c
index 98fe5ec..96aff65 100644
--- 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 0cbf60a..3242c68 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -1169,4 +1169,6 @@ helper_const_non_const_cast (const char *p)
 /* Get definitions of HOST_WIDE_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 a2a7db0..2d96872 100644
--- a/gcc/tlink.c
+++ b/gcc/tlink.c
@@ -456,7 +456,7 @@ recompile_files (void)
   file *f;
 
   putenv (xstrdup ("COMPILER_PATH="));
-  putenv (xstrdup ("LIBRARY_PATH="));
+  putenv (xstrdup (LIBRARY_PATH_ENV "="));
 
   while ((f = file_pop ()) != NULL)
     {
iv class='path'>path: <a href='/guix/log/?id=ff777165cb7f82a3300cb97a05daf1641857ce04&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=ff777165cb7f82a3300cb97a05daf1641857ce04&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/packages?id=ff777165cb7f82a3300cb97a05daf1641857ce04&amp;showmsg=1'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=ff777165cb7f82a3300cb97a05daf1641857ce04&amp;showmsg=1'>patches</a>/<a href='/guix/log/gnu/packages/patches/nsis-env-passthru.patch?id=ff777165cb7f82a3300cb97a05daf1641857ce04&amp;showmsg=1'>nsis-env-passthru.patch</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/patches/nsis-env-passthru.patch?id=ff777165cb7f82a3300cb97a05daf1641857ce04'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2022-08-03 14:23:00 +0800'>2022-08-03</span></td><td class='logsubject'><a href='/guix/commit/gnu/packages/patches/nsis-env-passthru.patch?id=e2ad0b0f8b9cdea88211827b40a5b46aa4d9f062'>gnu: nsis: Update to 3.08.</a></td><td>Vivien Kraus</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/patches/nsis-source-date-epoch.patch: Drop this patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/patches/nsis-env-passthru.patch: Adjust the patch.
* gnu/packages/installers.scm (make-nsis): Update to 3.08.

Signed-off-by: 宋文武 &lt;iyzsong@member.fsf.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2019-10-11 11:44:44 -0400'>2019-10-11</span></td><td class='logsubject'><a href='/guix/commit/gnu/packages/patches/nsis-env-passthru.patch?id=e214a22007450187c3db5d9fdef6ee021be6e953'>gnu: Add nsis-x86_64 and nsis-i686.</a></td><td>Carl Dong</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/build-system/scons.scm (scons-build): Add build-targets and
install-targets parameters.
* guix/build/scons-build-system.scm (build, install): Adjust
accordingly.
* doc/guix.texi (Build Systems): Document it.
* gnu/packages/installers.scm: New file,
(make-nsis): New procedure,
(nsis-x86_64, nsis-i686): New variables.
* gnu/packages/patches/nsis-env-passthru.patch: New file.
* gnu/local.mk (dist_patch_DATA, GNU_SYSTEM_MODULES): Adjust
accordingly.


</td></tr>