[bug#36272] [PATCH] gnu: rust: fix building bootstrap chain

[Ivan Petkov <ivanppetkov@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 919 bytes --]

Hi Danny,

> On Jun 17, 2019, at 11:51 PM, Danny Milosavljevic <dannym@scratchpost.org> wrote:
> 
> So try running "make" in guix.

I always run make before any ./pre-inst-env invocation, and that’s what raises the error.

> Otherwise "grep -r gdb-llvm ." to find left-overs, if any.

No results (besides those in .git). Maybe it’s because there are items in the store which
have references to it and guix is getting confused somewhere? Unfortunately, I don’t
know enough to stipulate further...

> If nothing else helps, rm -rf ~/.cache/guile

Unfortunately this didn’t help either :(

I’m willing to get this merged in as is for now, get rust to build again, and clean up my store
with `guix gc` before trying to delete the patch file again. Maybe things will work then.

Also attaching one more patch update, this time for bumping to llvm@8 for the latest
rust version!

—Ivan


[-- Attachment #2: 0003-gnu-rust-use-llvm-8.patch --]
[-- Type: application/octet-stream, Size: 1774 bytes --]

From f25bff63091da94595aa0b2d096b9f3b9f64544f Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Mon, 17 Jun 2019 22:10:52 -0700
Subject: [PATCH 3/3] gnu: rust: use llvm@8

* gnu/packages/llvm.scm (llvm): Rename to...
(llvm-8): ...this.
(llvm): New variable.
* gnu/packages/rust.scm (rust)[inputs]: Use llvm-8
---
 gnu/packages/llvm.scm | 4 +++-
 gnu/packages/rust.scm | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 8cb05a6cad..0ae4373c05 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -47,7 +47,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages xml))
 
-(define-public llvm
+(define-public llvm-8
   (package
     (name "llvm")
     (version "8.0.0")
@@ -98,6 +98,8 @@ languages is in development.  The compiler infrastructure includes mirror sets
 of programming tools as well as libraries with equivalent functionality.")
     (license license:ncsa)))
 
+(define-public llvm llvm-8)
+
 (define* (clang-runtime-from-llvm llvm hash
                                   #:optional (patches '()))
   (package
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index c83c8a6784..9444d8be73 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1056,6 +1056,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
            "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas")))
     (package
       (inherit base-rust)
+      (inputs
+       (alist-replace "llvm" (list llvm-8)
+                      (package-inputs base-rust)))
       (arguments
        (substitute-keyword-arguments (package-arguments base-rust)
          ((#:phases phases)
-- 
2.22.0


[-- Attachment #3: Type: text/plain, Size: 1 bytes --]