[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: build-system: cargo: Use correct cargo.
From: |
David Craven |
Subject: |
02/02: build-system: cargo: Use correct cargo. |
Date: |
Wed, 4 Jan 2017 10:29:38 +0000 (UTC) |
dvc pushed a commit to branch master
in repository guix.
commit 3b7ccbe94c3e15a04f1809c5acc894799426235e
Author: David Craven <address@hidden>
Date: Thu Dec 29 16:28:47 2016 +0100
build-system: cargo: Use correct cargo.
* gnu/packages/rust.scm (cargo-bootstrap): Make private.
* guix/build-system/cargo.scm (default-cargo): Use cargo.
---
gnu/packages/rust.scm | 4 +---
guix/build-system/cargo.scm | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 0812292..97d0d7c 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 ffc0afd..3582f0e 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."