diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-08-22 15:53:27 -0400 |
| commit | 893c2df00daa4e6dd6a7ff3813d7df5329877f9e (patch) | |
| tree | acd0db459464acae47083b66d5ce12cc656e2f10 /gnu/packages/cross-base.scm | |
| parent | 04b9b7bb05aff4c41f46cd79aa7bc953ace16e86 (diff) | |
| parent | 0ccc9a0f5bb89b239d56157ea66f8420fcec5ba6 (diff) | |
| download | guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar guix-893c2df00daa4e6dd6a7ff3813d7df5329877f9e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/cross-base.scm')
| -rw-r--r-- | gnu/packages/cross-base.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 3fc9ba6540..78dae7431a 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2019 Carl Dong <contact@carldong.me> ;;; ;;; This file is part of GNU Guix. ;;; @@ -267,7 +268,7 @@ target that libc." (cond ((target-mingw? target) (if libc - `(("libc" ,mingw-w64) + `(("libc" ,libc) ,@inputs) `(("mingw-source" ,(package-source mingw-w64)) ,@inputs))) @@ -508,7 +509,8 @@ and the cross tool chain." #:optional (libc glibc)) (if (target-mingw? target) - mingw-w64 + (let ((machine (substring target 0 (string-index target #\-)))) + (make-mingw-w64 machine)) libc)) (define* (cross-newlib? target |