RUNPATH problem building Rust 1.40.0

[Matthew Kraai]

Hi,

I'm trying to package Rust 1.40.0.  Here's the patch I'm testing:

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index d139657f39..58515d55e6 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1183,4 +1183,23 @@ move around."
                  (generate-all-checksums "vendor")
                  #t)))))))))
 
-(define-public rust rust-1.39)
+(define-public rust-1.40
+  (let ((base-rust
+         (rust-bootstrapped-package rust-1.39 "1.40.0"
+           "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx")))
+    (package
+      (inherit base-rust)
+      (source
+        (origin
+          (inherit (package-source base-rust))
+          (snippet '(begin
+                      (delete-file-recursively "src/llvm-project")
+                      (delete-file-recursively "vendor/jemalloc-sys/jemalloc")
+                      #t))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base-rust)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (delete 'remove-unsupported-tests))))))))
+
+(define-public rust rust-1.40)

It currently fails to build with the following error:

/gnu/store/j4zssa8y397q5l2hgkj5svcnj8dlgg32-rust-1.40.0/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so:
 error: depends on 'librustc_driver-1040000d6b8afc7f.so', which cannot be found 
in RUNPATH 
("/gnu/store/j4zssa8y397q5l2hgkj5svcnj8dlgg32-rust-1.40.0/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/../lib"
 "/gnu/store/sqpf340l6nnjw33395kmjv97vm8bp8pv-llvm-8.0.0/lib" 
"/gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/gcc/x86_64-unknown-linux-gnu/7.5.0/../../.."
 "/gnu/store/fa6wj5bxkj5ll1d7292a70knmyl7a0cr-glibc-2.31/lib")

librustc_driver-1040000d6b8afc7f.so is in
/gnu/store/j4zssa8y397q5l2hgkj5svcnj8dlgg32-rust-1.40.0/lib, which is
not in the RUNPATH.  Does anyone know how I should resolve this?

-- 
Matthew Kraai