ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-15 23:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/cargo: Do not pass --features to Cargo unless specified.

Browse source 
Fixes <https://bugs.gnu.org/44692>.

* guix/build/cargo-build-system.scm (build): Default to the empty list for
FEATURES.  Check whether the list is empty when building the Cargo arguments.
This commit is contained in:
Marius Bakke 2020-11-20 09:58:04 +01:00
parent 007edfb72a
commit be8a0881f1
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix/build/cargo-build-system.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -141,14 +142,17 @@ (define* (patch-cargo-checksums #:key
(define* (build #:key (define* (build #:key
skip-build? skip-build?
features (features '())
(cargo-build-flags '("--release")) (cargo-build-flags '("--release"))
#:allow-other-keys) #:allow-other-keys)
"Build a given Cargo package." "Build a given Cargo package."
(or skip-build? (or skip-build?
(apply invoke "cargo" "build" (apply invoke
"--features" (string-join features) `("cargo" "build"
cargo-build-flags))) ,@(if (null? features)
'()
`("--features" ,(string-join features)))
,@cargo-build-flags))))
(define* (check #:key (define* (check #:key
tests? tests?