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; }
span>| gnu: dub: Update to 1.5.0.... | Tobias Geerinckx-Rice |
| 2017-08-11 | gnu: dub: Update to 1.4.1.... | Tobias Geerinckx-Rice |
| 2017-07-20 | gnu: dub: Update to 1.4.0.... | Tobias Geerinckx-Rice |
| 2017-06-20 | gnu: Move contents of zip module into compression module.... | Arun Isaac |
| 2017-06-13 | gnu: ldc-bootstrap: Update ldc to 0.17.4.... | Danny Milosavljevic |
| 2017-04-14 | gnu: dub: Flesh out synopsis & description.... | Tobias Geerinckx-Rice |
| 2017-04-11 | gnu: dub: Update to 1.3.0.... | Tobias Geerinckx-Rice |
| 2017-04-06 | gnu: ldc-bootstrap: Delete failing test.... | Ricardo Wurmus |
| 2017-03-10 | gnu: dub: Update to 1.2.2.... | Danny Milosavljevic |
| 2017-02-25 | gnu: ldc-bootstrap: Update to 0.17.3.... | Danny Milosavljevic |
| 2017-02-25 | gnu: ldc: Update to 1.1.1.... | Danny Milosavljevic |
| 2017-02-10 | gnu: rdmd: Update to 2.073.0.... | Danny Milosavljevic |
| 2017-02-10 | gnu: ldc: Update to 1.1.0.... | Danny Milosavljevic |
| 2017-02-10 | gnu: ldc: Rename ldc 0.17.2 to ldc-bootstrap.... | Danny Milosavljevic |
| 2017-01-29 | gnu: Add dub.... | Danny Milosavljevic |
| 2017-01-28 | gnu: Add ldc@1.1.0-beta6.... | Muriithi Frederick Muriuki |