01/03: build/cargo-build-system: Set CARGO_HOME early.

[guix-commits]

dannym pushed a commit to branch master
in repository guix.

commit c82c16a6f3cfeec82ba8bd7572b11852a6152c7e
Author: Robert Vollmert <address@hidden>
Date:   Mon Jul 15 21:41:53 2019 +0200

    build/cargo-build-system: Set CARGO_HOME early.
    
    * guix/build/cargo-build-system.scm (configure): Set CARGO_HOME.
    (install): No longer set CARGO_HOME.
    
    Signed-off-by: Danny Milosavljevic <address@hidden>
---
 guix/build/cargo-build-system.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/guix/build/cargo-build-system.scm 
b/guix/build/cargo-build-system.scm
index 1f36304..e4e62dd 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -99,6 +99,7 @@ Cargo.toml file present at its root."
     inputs)
 
   ;; Configure cargo to actually use this new directory.
+  (setenv "CARGO_HOME" (string-append (getcwd) "/.cargo"))
   (mkdir-p ".cargo")
   (let ((port (open-file ".cargo/config" "w" #:encoding "utf-8")))
     (display "
@@ -148,9 +149,6 @@ directory = '" port)
     ;; Make cargo reuse all the artifacts we just built instead
     ;; of defaulting to making a new temp directory
     (setenv "CARGO_TARGET_DIR" "./target")
-    ;; Force cargo to honor our .cargo/config definitions
-    ;; https://github.com/rust-lang/cargo/issues/6397
-    (setenv "CARGO_HOME" ".")
 
     ;; Only install crates which include binary targets,
     ;; otherwise cargo will raise an error.