diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index e81b85d5813..2425c0924e5 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1082,33 +1082,6 @@ Library.") (string-append (getcwd) "/lib")))) (delete 'install-opt-viewer))))))) -(define-public llvm-3.5 - (package (inherit llvm-6) - (version "3.5.2") - (source - (origin - (method url-fetch) - (uri (llvm-uri "llvm" version)) - (patches - (search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch")) - (sha256 - (base32 - "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4")))) - (outputs '("out")) - (arguments - (substitute-keyword-arguments (package-arguments llvm-6) - ((#:phases phases) - #~(modify-phases #$phases - (add-before 'build 'shared-lib-workaround - ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen - ;; doesn't seem to get the correct rpath to be able to run - ;; from the build directory. Set LD_LIBRARY_PATH as a - ;; workaround. - (lambda _ - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/lib")))) - (delete 'install-opt-viewer))))))) - (define-public llvm-16 (make-llvm "16.0.6")) diff --git a/gnu/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch b/gnu/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch deleted file mode 100644 index faa8252c432..00000000000 --- a/gnu/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch was downloaded from https://sft.its.cern.ch/jira/browse/ROOT-7047. -It fixes the build of clang 3.5 with GCC 5. File paths have been adjusted. - -From 00f3ed6eee41da871799ad0fd19153c7682d61fe Mon Sep 17 00:00:00 2001 -From: Alexander Klimov -Date: Mon, 26 Jan 2015 18:45:23 +0200 -Subject: [PATCH] [ADT/IntrusiveRefCntPtr] Give friend access to - IntrusiveRefCntPtr so the relevant move constructor can - access 'Obj'. - -From LLVM upstream: -Author: Argyrios Kyrtzidis -Date: Tue Sep 23 06:06:43 2014 +0000 -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218295 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - interpreter/llvm/src/include/llvm/ADT/IntrusiveRefCntPtr.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h -index f9df378..c859c98 100644 ---- a/include/llvm/ADT/IntrusiveRefCntPtr.h -+++ b/include/llvm/ADT/IntrusiveRefCntPtr.h -@@ -197,6 +197,9 @@ public: - private: - void retain() { if (Obj) IntrusiveRefCntPtrInfo::retain(Obj); } - void release() { if (Obj) IntrusiveRefCntPtrInfo::release(Obj); } -+ -+ template -+ friend class IntrusiveRefCntPtr; - }; - - template --- -1.7.10.4 -