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 index a716f708259..dc7862f413a 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -4342,7 +4342,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 b11c6a57939..a66a94a04e5 100644 --- 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 index 4abc321c71d..d6186476024 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -1209,4 +1209,6 @@ helper_const_non_const_cast (const char *p) void qsort_chk (void *, size_t, size_t, int (*)(const void *, const void *)); #endif +#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" + #endif /* ! GCC_SYSTEM_H */ diff --git a/gcc/tlink.c b/gcc/tlink.c index ec20bd2fa0f..cd17bdce004 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) { 33 +0100'>2024-12-12build: Fix detection of guile-ssh....Fixes <https://issues.guix.gnu.org/74800>. The check for make-session stopped working after update to 0.18.0. This commit adds the additional `#:config #f' to skip reading the ssh configuration, arguably we did not want to do that anyway. * m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Add `#:config #f' to make-session call. Change-Id: Id6ea3860292159ac2e6cf2a77df5f720f66aa071 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Reported-by: Dariqq <dariqq@posteo.net> Tomas Volf 2024-12-03gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd....On commit: ec8a5ec15f898e864705e5a5c834532e3fa8d0a4 gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/ With guix hash -r: 15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for x86_64-gnu. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu. * guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu. (%cuirass-supported-systems): Remove x86_64-gnu. * guix/utils.scm (target-64bit?): Add x86_64-gnu. * m4/guix.m4: Add x86_64-gnu as a supported system. * doc/guix.texi (GNU Distribution): Add x86_64-gnu. Change-Id: I828159aedb3f66caba98e935083cc3682429f219 Janneke Nieuwenhuizen 2023-11-07build: Fix spelling in m4 macros....* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Fix spelling of parameter. (GUIX_CHECK_FILE_NAME_LIMITS): Fix spelling of maximum. Change-Id: I93c80441393622a4bc06daa475eee13874cca527 Efraim Flashner 2023-03-16build: Correct guix_system on musl libc distros....* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add linux-musl* case. This prevents the macro from mis-parsing the host OS, which causes breakage when building from source. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Antero Mejr