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; }
20-09-06| gnu: Add node@10.22....* gnu/packages/node.scm (node-10.22): New variable.
| Pierre Langlois |
| 2020-09-06 | gnu: node: Downgrade to 10.20.0....Fixes <https://issues.guix.gnu.org/43228>.
* gnu/packages/node.scm (node): Downgrade to 10.22.0.
[inputs]: Downgrade nghttp2 to 1.40.
| Pierre Langlois |
| 2020-09-04 | gnu: node: Update 10.22.0....* gnu/packages/node.scm (node): Update to 10.22.0.
[inputs]: Replace nghttp2 with nghttp2-1.41.
| Pierre Langlois |
| 2020-06-13 | gnu: libnode: Delete unused phase....This is a follow-up to commit bb310a1976198eacdc67e0712e19735cd656b21d.
* gnu/packages/node.scm (libnode)[arguments]: Delete phase
"patch-npm-shebang".
| Ricardo Wurmus |
| 2020-06-13 | Revert "gnu: node: Build shared library."...This reverts commit f9311eaa7cb7849e9b17162c93b874c74d8fcbbd.
Adding "--shared" replaces the executable with the shared library, breaking
all users of the nodejs executable.
| Ricardo Wurmus |
| 2020-06-13 | gnu: Add libnode....* gnu/packages/node.scm (libnode): New variable.
| Ricardo Wurmus |
| 2020-06-13 | gnu: node: Build shared library....* gnu/packages/node.scm (node)[arguments]: Build shared library.
| Ricardo Wurmus |
| 2020-03-04 | Merge branch 'master' into core-updates | Marius Bakke |
| 2020-02-26 | gnu: node: Disable failing tests on armhf-linux....* gnu/packages/node.scm (node)[arguments]: When building on
armhf-linux, disable several zlib tests.
| Marius Bakke |
| 2020-02-26 | gnu: node: Update to 10.19.0....* gnu/packages/node.scm (node): Update to 10.19.0.
[inputs]: Remove LIBUV and NGHTTP2:LIB. Add LIBUV/LATEST and
NGHTTP2-1.40:LIB.
| Marius Bakke |
| 2020-02-24 | gnu: node: Increase build timeouts....* gnu/packages/node.scm (node)[properties]: Add MAX-SILENT-TIME. Increase
TIMEOUT from 3600 seconds to 14400.
| Marius Bakke |