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.
This patch makes slight adjustments over "clang-libc-search-path.patch" for
changes in clang 3.8.
--- cfe-3.8.0.src/lib/Driver/ToolChains.cpp
+++ cfe-3.8.0.src/lib/Driver/ToolChains.cpp
@@ -3661,6 +3661,9 @@
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 = DetectDistro(D, Arch);
if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) {
@@ -3702,6 +3705,7 @@
if (IsOpenSUSE(Distro))
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.
@@ -3771,14 +3775,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,
@@ -3791,6 +3793,7 @@
BiarchSibling.gccSuffix(),
Paths);
}
+#endif
// See comments above on the multilib variant for details of why this is
// included even from outside the sysroot.
@@ -3815,8 +3818,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; }
elease-manifest.scm?id=3867cb7885d72f07cb34479738b4746443ca5b92'>maint: Don't require unsupported packages such as GNOME on i686-linux....| Ludovic Courtès |
| 2021-04-27 | maint: Require "emacs-no-x" instead of "emacs" on armhf-linux.... | Ludovic Courtès |
| 2021-04-27 | maint: Don't require 'bootstrap-tarballs' for powerpc64le-linux.... | Ludovic Courtès |
| 2021-03-10 | ci: Remove hydra support.... | Mathieu Othacehe |
| 2020-11-08 | maint: Reduce the package set for "i586-gnu".... | Ludovic Courtès |
| 2020-10-13 | installer: Add Emacs EXWM desktop environment.... | Jan (janneke) Nieuwenhuizen |
| 2020-04-15 | Merge branch 'master' into core-updates | Marius Bakke |
| 2020-04-14 | maint: Ensure substitutes are available for '%default-xorg-modules'.... | Ludovic Courtès |
| 2020-04-14 | maint: Actually check for the availablility of system packages.... | Ludovic Courtès |
| 2020-04-08 | maint: Adjust release manifest for Guile 3.0 switch.... | Marius Bakke |
| 2020-04-08 | maint: Cross-build GUILE-2.2/FIXED.... | Ludovic Courtès |
| 2020-04-07 | maint: Remove GCC from the packages to cross-build.... | Ludovic Courtès |
| 2020-04-04 | maint: Remove unsupported cross-compilation jobs from 'release-manifest.scm'.... | Ludovic Courtès |
| 2020-03-13 | maint: Add 'etc/release-manifest.scm'.... | Ludovic Courtès |