diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/llvm.scm | 13 | ||||
| -rw-r--r-- | gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch | 13 |
3 files changed, 0 insertions, 27 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 511bffe740..8530f3311a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1829,7 +1829,6 @@ dist_patch_DATA = \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ - %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ %D%/packages/patches/llvm-13-gcc-14.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index bfaf072ba7..94e37eeca4 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1190,19 +1190,6 @@ Library.") #:legacy-build-shared-libs? #t #:patches '("clang-3.5-libc-search-path.patch"))) -(define-public llvm-3.6 - (package (inherit llvm-3.7) - (version "3.6.2") - (source - (origin - (method url-fetch) - (uri (llvm-uri "llvm" version)) - (patches - (search-patches "llvm-3.6-fix-build-with-gcc-10.patch")) - (sha256 - (base32 - "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn")))))) - (define-public llvm-3.5 (package (inherit llvm-3.7) (version "3.5.2") diff --git a/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch b/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch deleted file mode 100644 index 4982587d15..0000000000 --- a/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,13 +0,0 @@ -Adapted from https://github.com/digego/extempore/pull/322/files - ---- a/include/llvm/IR/ValueMap.h 2015-08-04 00:30:24.000000000 +0200 -+++ b/include/llvm/IR/ValueMap.h 2018-07-14 21:09:09.769502736 +0200 -@@ -99,7 +99,7 @@ - explicit ValueMap(const ExtraData &Data, unsigned NumInitBuckets = 64) - : Map(NumInitBuckets), Data(Data) {} - -- bool hasMD() const { return MDMap; } -+ bool hasMD() const { return static_cast<bool>(MDMap); } - MDMapT &MD() { - if (!MDMap) - MDMap.reset(new MDMapT); |