guix_mirror_bot pushed a commit to branch master
in repository guix.
commit df272322fdb874bac9e13693d412b03f62125c94
Author: Andreas Enge <[email protected]>
AuthorDate: Tue Aug 19 21:03:14 2025 +0200
gnu: Remove clang-7.
* gnu/packages/llvm.scm (clang-7): Delete variable.
* gnu/packages/patches/clang-7.0-libc-search-path.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister file.
Change-Id: I75743853aa656630a4541f42bf577882226b51d3
---
gnu/local.mk | 1 -
gnu/packages/llvm.scm | 6 --
.../patches/clang-7.0-libc-search-path.patch | 94 ----------------------
3 files changed, 101 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 03239bd288..ec90390ecc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1114,7 +1114,6 @@ dist_patch_DATA =
\
%D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \
%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-10.0-libc-search-path.patch \
%D%/packages/patches/clang-11.0-libc-search-path.patch \
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index a0c60b8c9d..dbbf77bd0a 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1202,12 +1202,6 @@ Library.")
'("clang-runtime-9-libsanitizer-mode-field.patch"
"clang-runtime-9-glibc-2.36-compat.patch")))
-(define-public clang-7
- (clang-from-llvm llvm-7 clang-runtime-7
- "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"
- #:legacy-build-shared-libs? #t
- #:patches '("clang-7.0-libc-search-path.patch")))
-
(define-public llvm-6
(package
(inherit llvm-10)
diff --git a/gnu/packages/patches/clang-7.0-libc-search-path.patch
b/gnu/packages/patches/clang-7.0-libc-search-path.patch
deleted file mode 100644
index cb7088eda4..0000000000
--- a/gnu/packages/patches/clang-7.0-libc-search-path.patch
+++ /dev/null
@@ -1,94 +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 2c4d44f..0493b0a 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(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 7fb4ae4..cb21344 100644
---- a/lib/Driver/ToolChains/Cuda.cpp
-+++ b/lib/Driver/ToolChains/Cuda.cpp
-@@ -66,6 +66,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 f8f3623..36dc722 100644
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -225,7 +225,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args)
- 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()) {
-@@ -284,6 +286,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.
-@@ -348,6 +351,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.
-@@ -393,6 +397,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,
-@@ -428,9 +434,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);
- }
-
- bool Linux::HasNativeLLVMSupport() const { return true; }
