aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Craven <david@craven.ch>2016-12-29 16:28:47 +0100
committerDavid Craven <david@craven.ch>2017-01-04 11:29:15 +0100
commit3b7ccbe94c3e15a04f1809c5acc894799426235e (patch)
treeba056211317381c8d1d54097167fd5a2e5367ddf
parentb5a09649dbe441bd2959a386f685105b90160ef9 (diff)
downloadguix-3b7ccbe94c3e15a04f1809c5acc894799426235e.tar
guix-3b7ccbe94c3e15a04f1809c5acc894799426235e.tar.gz
build-system: cargo: Use correct cargo.
* gnu/packages/rust.scm (cargo-bootstrap): Make private. * guix/build-system/cargo.scm (default-cargo): Use cargo.
-rw-r--r--gnu/packages/rust.scm4
-rw-r--r--guix/build-system/cargo.scm3
2 files changed, 2 insertions, 5 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 08122923b6..97d0d7cb0d 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -122,9 +122,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 ffc0afda3b..3582f0e328 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."