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

--- cfe-6.0.0.src/lib/Driver/ToolChains/Linux.cpp
+++ cfe-6.0.0.src/lib/Driver/ToolChains/Linux.cpp
@@ -207,7 +207,9 @@
   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
                          GCCInstallation.getTriple().str() + "/bin")
                        .str());
-
+  // 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());
 
   if (Distro.IsAlpineLinux()) {
@@ -255,6 +257,7 @@
 
   if (IsAndroid || Distro.IsOpenSUSE())
     ExtraOpts.push_back("--enable-new-dtags");
+#endif
 
   // 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.
@@ -329,14 +332,12 @@
     addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
   }
 
-  addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths);
-  addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths);
-  addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
-  addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths);
-
   // 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,
@@ -349,6 +350,7 @@
                              BiarchSibling.gccSuffix(),
                       Paths);
     }
+#endif
 
     // See comments above on the multilib variant for details of why this is
     // included even from outside the sysroot.
@@ -373,8 +375,9 @@
   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);
 }
 
 bool Linux::HasNativeLLVMSupport() const { return true; }
nippets.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: Ic16f571f26fffee12e478e00c54be55e6eb90831
Signed-off-by: jgart &lt;jgart@dismail.de&gt;
</span></span></td><td>Nicolas Graves</td></tr>
<tr><td><span title='2023-10-21 00:27:25 +0200'>2023-10-21</span></td><td><a href='/guix/commit/etc/snippets?id=e011961f99e3cab8ff1972de2b4659e972bb00a0'>build-system: Add zig-build-system.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/build-system/zig.scm: New file.
* guix/build/zig-build-system.scm: New file.
* Makefile.am: Add them.
* doc/guix.texi: Document it.
* etc/snippets/yas/scheme-mode/guix-package (build-system): Add
  zig-build-system.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Ekaitz Zarraga</td></tr>
<tr><td><span title='2023-10-15 12:28:19 +0200'>2023-10-15</span></td><td><a href='/guix/commit/etc/snippets?id=ef026e68fe58ed3be216c76f7c5f008893ed3095'>etc: snippets: Do not match unintended quotes.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/tempel/scheme-mode (origin): Unquote ‘git-fetch’, ‘svn-fetch’,
‘hg-fetch’, ‘cvs-fetch’, and ‘bzr-fetch’.  Use ‘otherwise’ instead of ‘t’.
</span></span></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2023-04-19 20:12:22 -0400'>2023-04-19</span></td><td><a href='/guix/commit/etc/snippets?id=7cb21556b6031c9f7e187329b6663768425aa850'>snippets: tempel: Simplify git-commit-mode detection.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/snippets/tempel/text-mode: Simplify git-commit-mode detection.

Signed-off-by: Andrew Tropin &lt;andrew@trop.in&gt;
</span></span></td><td>Nicolas Graves</td></tr>