guix_mirror_bot pushed a commit to branch master
in repository guix.
commit e110789d24f32f1e313aae15362b155a791f2acc
Author: Andreas Enge <[email protected]>
AuthorDate: Tue Aug 19 20:37:05 2025 +0200
gnu: Remove clang-9.
* gnu/packages/llvm.scm (clang-9): Delete variable.
* gnu/packages/patches/clang-9.0-libc-search-path.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister file.
Change-Id: I1f6b288999f476583f6025de71c173b5511c4bb2
Change-Id: Ia81275e0a6600aba2d76c00534e4f88d63f61f34
---
gnu/local.mk | 1 -
gnu/packages/llvm.scm | 6 --
.../patches/clang-9.0-libc-search-path.patch | 93 ----------------------
3 files changed, 100 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 4b15534a11..5d8a949aa6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1116,7 +1116,6 @@ dist_patch_DATA =
\
%D%/packages/patches/clang-6.0-libc-search-path.patch \
%D%/packages/patches/clang-7.0-libc-search-path.patch \
%D%/packages/patches/clang-8.0-libc-search-path.patch \
- %D%/packages/patches/clang-9.0-libc-search-path.patch \
%D%/packages/patches/clang-10.0-libc-search-path.patch \
%D%/packages/patches/clang-11.0-libc-search-path.patch \
%D%/packages/patches/clang-12.0-libc-search-path.patch \
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index fe653f455b..850bf9f135 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1176,12 +1176,6 @@ Library.")
'("clang-runtime-9-libsanitizer-mode-field.patch"
"clang-runtime-9-glibc-2.36-compat.patch")))
-(define-public clang-9
- (clang-from-llvm llvm-9 clang-runtime-9
- "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p"
- #:legacy-build-shared-libs? #t
- #:patches '("clang-9.0-libc-search-path.patch")))
-
(define-public llvm-8
(package
(inherit llvm-9)
diff --git a/gnu/packages/patches/clang-9.0-libc-search-path.patch
b/gnu/packages/patches/clang-9.0-libc-search-path.patch
deleted file mode 100644
index 1984895a9c..0000000000
--- a/gnu/packages/patches/clang-9.0-libc-search-path.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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 foreign distros.
-
-diff --git a/lib/Driver/Distro.cpp b/lib/Driver/Distro.cpp
-index f2a3074d..536db89c 100644
---- a/lib/Driver/Distro.cpp
-+++ b/lib/Driver/Distro.cpp
-@@ -18,6 +18,10 @@ using namespace clang::driver;
- using namespace clang;
-
- static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
-+ // The compiler should always behave the same, even when used via Guix on a
-+ // foreign distro.
-+ return Distro::UnknownDistro;
-+
- llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
- VFS.getBufferForFile("/etc/lsb-release");
- if (File) {
-diff --git a/lib/Driver/ToolChains/Cuda.cpp b/lib/Driver/ToolChains/Cuda.cpp
-index 96f8c513..64fd7a26 100644
---- a/lib/Driver/ToolChains/Cuda.cpp
-+++ b/lib/Driver/ToolChains/Cuda.cpp
-@@ -69,6 +69,9 @@ CudaInstallationDetector::CudaInstallationDetector(
- const Driver &D, const llvm::Triple &HostTriple,
- const llvm::opt::ArgList &Args)
- : D(D) {
-+ // Don't look for CUDA in /usr.
-+ return;
-+
- struct Candidate {
- std::string Path;
- bool StrictChecking;
-diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
-index 7f59bc77..67d8ce22 100644
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -240,6 +240,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args)
- .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() || Triple.isAndroid()) {
-@@ -306,6 +309,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args)
-
- 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.
-@@ -369,6 +373,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args)
- }
- }
-
-+#if 0
- // Similar to the logic for GCC above, if we currently running Clang inside
- // of the requested system root, add its parent library paths to
- // those searched.
-@@ -414,6 +419,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args)
- // 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.
- addPathIfExists(D,
- SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str()
+
- "/../../" + OSLibDir,
-@@ -449,9 +456,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args)
- // directory ('Dir' below) or the ResourceDir.
- if (StringRef(D.Dir).startswith(SysRoot))
- addPathIfExists(D, D.Dir + "/../lib", Paths);
-+#endif
-+
-+ // 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);
-
-- addPathIfExists(D, SysRoot + "/lib", Paths);
-- addPathIfExists(D, SysRoot + "/usr/lib", Paths);
-+ // Add GCC's lib/ directory so libstdc++.so can be found.
-+ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths);
- }
-
- ToolChain::CXXStdlibType Linux::GetDefaultCXXStdlibType() const {
