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; }
</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-08-12 23:09:07 +0100'>2024-08-12</span></td><td><a href='/guix/commit/gnu/packages/wxwidgets.scm?id=23fc353b3a5ad874b65c1b9d2ee55b2892db056c'>gnu: Add prusa-wxwidgets.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/engineering.scm (prusa-wxwidgets): New variable.
* gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register "prusa-wxwidgets-makefile-fix.patch".

Co-authored-by: Nikita Domnitskii &lt;nikita@domnitskii.me&gt;
Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99
Signed-off-by: Sharlatan Hellseher &lt;sharlatanus@gmail.com&gt;
</span></span></td><td>Artyom V. Poptsov</td></tr>
<tr><td><span title='2024-06-24 08:51:40 -0400'>2024-06-24</span></td><td><a href='/guix/commit/gnu/packages/wxwidgets.scm?id=7ae5decaeb3b379cc6fffb60f53513ee55fda0fd'>gnu: wxwidgets: Update to 3.2.5.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.2.5.

Change-Id: I61786e67c2b99ceea5124ee26f50b495fbaeb69f
Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
</span></span></td><td>Andy Tai</td></tr>
<tr><td><span title='2024-05-15 21:12:50 +0100'>2024-05-15</span></td><td><a href='/guix/commit/gnu/packages/wxwidgets.scm?id=86bf94bd878e2e25a2adc1d0f0cc215906fee7a1'>gnu: wxwidgets: Update to 3.2.4</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.2.4

Change-Id: I06eebd1e23610c87b7f67ae9a8567e0190eb43ed
Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>Andy Tai</td></tr>