Clang attempts to guess file names based on the OS and distro (yes!), but unfortunately, that doesn't work for us. This patch makes it easy to insert libc's $libdir so that Clang passes the correct absolute file name of crt1.o etc. to 'ld'. It also disables all the distro-specific stuff and removes the hard-coded FHS directory names to make sure Clang also works on non-Guix systems. diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp --- a/lib/Driver/ToolChains/Gnu.cpp +++ b/lib/Driver/ToolChains/Gnu.cpp @@ -2797,7 +2797,7 @@ void Generic_GCC::AddMultilibPaths(const Driver &D, // the cross. Note that GCC does include some of these directories in some // configurations but this seems somewhere between questionable and simply // a bug. - if (StringRef(LibPath).startswith(SysRoot)) { + if (0) { addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths); addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths); } @@ -2811,6 +2811,10 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, // Try walking via the GCC triple path in case of biarch or multiarch GCC // installations with strange symlinks. if (GCCInstallation.isValid()) { + +// The following code would end up adding things like +// "/usr/lib/x86_64-unknown-linux-gnu/../../lib64" to the search path. +#if 0 addPathIfExists(D, SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + "/../../" + OSLibDir, @@ -2823,6 +2827,7 @@ void Generic_GCC::AddMultiarchPaths(const Driver &D, D, GCCInstallation.getInstallPath() + BiarchSibling.gccSuffix(), Paths); } +#endif // Guix // See comments above on the multilib variant for details of why this is // included even from outside the sysroot. diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp --- a/lib/Driver/ToolChains/Linux.cpp +++ b/lib/Driver/ToolChains/Linux.cpp @@ -219,6 +219,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) Generic_GCC::PushPPaths(PPaths); +// Comment out the distro-specific tweaks so that they don't bite when +// using Guix on a foreign distro. +#if 0 Distro Distro(D.getVFS(), Triple); if (Distro.IsAlpineLinux() || Triple.isAndroid()) { @@ -284,6 +287,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) if (IsAndroid || Distro.IsOpenSUSE()) ExtraOpts.push_back("--enable-new-dtags"); +#endif // Guix // The selection of paths to try here is designed to match the patterns which // the GCC driver itself uses, as this is part of the GCC-compatible driver. @@ -310,6 +314,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths); addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths); +// This requires the commented distro tweaks above. +#if 0 if (IsAndroid) { // Android sysroots contain a library directory for each supported OS // version as well as some unversioned libraries in the usual multiarch @@ -338,6 +344,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) addPathIfExists(D, SysRoot + "/" + OSLibDir + "/" + ABIName, Paths); addPathIfExists(D, SysRoot + "/usr/" + OSLibDir + "/" + ABIName, Paths); } +#endif // Guix Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); @@ -349,8 +356,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) if (StringRef(D.Dir).startswith(SysRoot)) addPathIfExists(D, D.Dir + "/../lib", Paths); - addPathIfExists(D, SysRoot + "/lib", Paths); - addPathIfExists(D, SysRoot + "/usr/lib", Paths); + // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, + // and friends can be found. + addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); } ToolChain::CXXStdlibType Linux::GetDefaultCXXStdlibType() const { v 2024-08-14gnu: cpu-features: Fix cross-compilation....* gnu/packages/assembly.scm (cpu-features)[arguments]<#:configure-flags>: When cross-compilation, set CMAKE_SYSTEM_PROCESSOR. Change-Id: I8b6f9bdeac66b85ab273f81a320e4b8e0d69b5d0 Signed-off-by: Christopher Baines <mail@cbaines.net> Zheng Junjie 2024-06-26gnu: Add cpu-features....* gnu/packages/assembly.scm (cpu-features): New variable. Change-Id: I9f3e0340024dbdbfb6f2f2a7e0820d71e5e5ba84 Signed-off-by: Guillaume Le Vaillant <glv@posteo.net> Andy Tai 2024-06-24gnu: rgbds: Update to 0.7.0....* gnu/packages/assembly.scm (rgbds): Update to 0.7.0. Change-Id: I992e7081fdf5816cba4f0b7437e513734f554a73 Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Felix Gruber 2024-06-20gnu: simde: Update to 0.8.2....* gnu/packages/assembly.scm (simde): Update to 0.8.2. Change-Id: I07f8323ded34bb855fe2315f8d9c7822efe26719 Signed-off-by: jgart <jgart@dismail.de> 宋文武 2024-06-02gnu: asl: Update to 1.42-beta-267....* gnu/packages/assembly.scm (asl): Update to 1.42-beta-267. Change-Id: I47bddede842f3d63f993a93965df0f0302ef45d1 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Simon South 2023-09-27gnu: Add blinkenlights....* gnu/packages/assembly.scm (blinkenlights): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> B. Wilson 2023-09-18gnu: Add asl....* gnu/packages/assembly.scm (asl): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Simon South 2023-09-10gnu: lightning: Update to 2.2.2....* gnu/packages/assembly.scm (lightning): Update to 2.2.2. Tobias Geerinckx-Rice