Search path environment variables for cross-compilers. See the discussion at . Note: Touch 'C_INCLUDE_PATH' et al. rather than 'CPATH', as discussed at . diff --git a/gcc/gcc.c b/gcc/gcc.c --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -4474,7 +4474,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 --- a/gcc/incpath.c +++ b/gcc/incpath.c @@ -472,8 +472,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); @@ -484,7 +484,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 @@ -1244,4 +1244,6 @@ void gcc_stablesort (void *, size_t, size_t, of the number. */ #define PRsa(n) "%" #n PRIu64 "%c" +#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" + #endif /* ! GCC_SYSTEM_H */ ter
AgeCommit message (Expand)Author
2021-01-02gnu: highlight: Update to 3.60....* gnu/packages/pretty-print.scm (highlight): Update to 3.60. Tobias Geerinckx-Rice
2020-11-15gnu: highlight: Update to 3.59....* gnu/packages/pretty-print.scm (highlight): Update to 3.59. Tobias Geerinckx-Rice
2020-11-11gnu: a2ps: Remove unused input....* gnu/packages/pretty-print.scm (a2ps)[inputs]: Remove IMAGEMAGICK. Marius Bakke
2020-10-09gnu: source-highlight: Allow cross-compilation....* gnu/packages/pretty-print.scm (source-highlight)[arguments]: Add 'skip-doc-directory' when (%current-target-system) is true. Ludovic Courtès
2020-09-15gnu: waybar: Fix build....Reported by bdju. * gnu/packages/pretty-print.scm (fmt-6): New variable. * gnu/packages/wm.scm (waybar)[inputs]: Replace fmt with fmt-6. Efraim Flashner
2020-09-13gnu: fmt: Update to 7.0.3....From 820d39a55a5673fffac70c919b8cc3b28d94f6e7 Mon Sep 17 00:00:00 2001 From: Greg Hogan <code@greghogan.com> Date: Fri, 11 Sep 2020 10:53:20 +0000 Subject: [PATCH] gnu: fmt: Update to 7.0.3. * gnu/packages/pretty-print.scm (fmt): Update to 7.0.3. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Greg Hogan
2020-09-11gnu: highlight: Update to 3.58....* gnu/packages/pretty-print.scm (highlight): Update to 3.58. Tobias Geerinckx-Rice
2020-06-30gnu: Sort package modules alphabetically in (gnu packages pretty-print)....* gnu/packages/pretty-print.scm: Sort package module imports alphabetically. Efraim Flashner
2020-06-03gnu: fmt: Update to 6.2.1....* gnu/packages/pretty-print.scm (fmt): Update to 6.2.1. Tobias Geerinckx-Rice
2020-04-04gnu: a2ps: Make some inputs native....* gnu/packages/pretty-print.scm (a2ps)[inputs]: Move groff from here... [native-inputs]: ...to here. Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com> Vincent Legoll