diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/llvm.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/clang-3.5-libc-search-path.patch | 66 |
3 files changed, 0 insertions, 73 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 897bc3be4f..58c5b9f84b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1089,7 +1089,6 @@ dist_patch_DATA = \ %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ - %D%/packages/patches/clang-3.5-libc-search-path.patch \ %D%/packages/patches/clang-3.8-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 3db26e8165..7a790e41fe 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1108,12 +1108,6 @@ Library.") (string-append (getcwd) "/lib")))) (delete 'install-opt-viewer))))))) -(define-public clang-3.7 - (clang-from-llvm llvm-3.7 clang-runtime-3.7 - "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn" - #:legacy-build-shared-libs? #t - #:patches '("clang-3.5-libc-search-path.patch"))) - (define-public llvm-3.5 (package (inherit llvm-3.7) (version "3.5.2") diff --git a/gnu/packages/patches/clang-3.5-libc-search-path.patch b/gnu/packages/patches/clang-3.5-libc-search-path.patch deleted file mode 100644 index 50e4480239..0000000000 --- a/gnu/packages/patches/clang-3.5-libc-search-path.patch +++ /dev/null @@ -1,66 +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 non-GuixSD systems. - ---- cfe-3.6.0.src/lib/Driver/ToolChains.cpp 2015-02-18 22:03:07.000000000 +0100 -+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp 2015-06-19 16:37:20.459701044 +0200 -@@ -2931,6 +2931,9 @@ Linux::Linux(const Driver &D, const llvm - - Linker = GetLinkerPath(); - -+ // Comment out the distro-specific tweaks so that they don't bite when -+ // using Guix on a foreign distro. -+#if 0 - Distro Distro = DetectDistro(Arch); - - if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) { -@@ -2973,6 +2976,7 @@ Linux::Linux(const Driver &D, const llvm - - 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. -@@ -3043,14 +3047,12 @@ Linux::Linux(const Driver &D, const llvm - addPathIfExists(D.Dir + "/../" + OSLibDir, Paths); - } - -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + OSLibDir, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(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(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + - "/../../" + OSLibDir, Paths); - -@@ -3060,6 +3062,7 @@ Linux::Linux(const Driver &D, const llvm - addPathIfExists(GCCInstallation.getInstallPath() + - BiarchSibling.gccSuffix(), Paths); - } -+#endif - - // See comments above on the multilib variant for details of why this is - // included even from outside the sysroot. -@@ -3083,8 +3086,9 @@ Linux::Linux(const Driver &D, const llvm - if (StringRef(D.Dir).startswith(SysRoot)) - addPathIfExists(D.Dir + "/../lib", Paths); - -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(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("@GLIBC_LIBDIR@", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { |