[PATCH 2/2] build-system: cargo: Use correct cargo.

[David Craven <david@craven.ch>]

* gnu/packages/rust.scm (cargo-bootstrap): Make private.
* guix/build-system/cargo.scm (default-cargo): Use cargo.
* guix/build/cargo-build-system.scm (install): Pass correct path to
  --root.
---
 gnu/packages/rust.scm             | 4 +---
 guix/build-system/cargo.scm       | 3 +--
 guix/build/cargo-build-system.scm | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index c6c4f3171..215030a7e 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -121,9 +121,7 @@
 which can in turn be used to build the final Rust compiler.")
     (license license:asl2.0)))
 
-;; FIXME: Make private once cargo is packaged. Is currently used by the
-;; cargo-build-system.
-(define-public cargo-bootstrap
+(define cargo-bootstrap
   (package
     (name "cargo-bootstrap")
     (version (cargo-version %rust-bootstrap-binaries-version))
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 8d835dda1..1ee28bcfe 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -46,8 +46,7 @@ to NAME and VERSION."
   "Return the default Cargo package."
   ;; Lazily resolve the binding to avoid a circular dependency.
   (let ((rust (resolve-interface '(gnu packages rust))))
-    ;; FIXME: Package cargo and replace cargo-bootstrap with cargo.
-    (module-ref rust 'cargo-bootstrap)))
+    (module-ref rust 'cargo)))
 
 (define (default-rustc)
   "Return the default Rustc package."
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 460d829b3..6357812f9 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -85,7 +85,7 @@
     ;; When the package includes executables we install
     ;; it using cargo install. This fails when the crate
     ;; doesn't contain an executable.
-    (system* "cargo" "install" "--root" bin)
+    (system* "cargo" "install" "--root" out)
     #t))
 
 (define %standard-phases
-- 
2.11.0