diff options
| author | Carl Dong <contact@carldong.me> | 2019-08-14 13:46:53 -0400 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-08-14 21:29:53 +0200 |
| commit | 67dac6b8920755cb011047157bb7b4fae4760143 (patch) | |
| tree | 897ea1e967ae6848874d7068f8287e59f5adbef7 /gnu/ci.scm | |
| parent | 4afdb792497472b968d818a3ed942beb70210389 (diff) | |
| download | guix-67dac6b8920755cb011047157bb7b4fae4760143.tar guix-67dac6b8920755cb011047157bb7b4fae4760143.tar.gz | |
gnu: mingw: Add x86_64 support.
This patch parameterizes previously hard-coded instances of
i686-w64-mingw32, adding support for x86_64-w64-mingw32.
* gnu/packages/mingw.scm (make-mingw-w64): New procedure.
(mingw-w64-i686, mingw-w64-x86_64): New variables.
(%mingw-triplet): Remove.
(mingw-w64): Update to point to 'mingw-w64-i686'.
* gnu/packages/cross-base.scm (cross-gcc): Use 'libc' keyword argument
if specified, instead of treating it as a boolean.
(native-libc): Return the correct mingw-w64 depending on machine
specified in target.
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add "x86_64-mingw".
* gnu/build/cross-toolchain.scm (set-cross-path/mingw): Replace
hardcoded 'i686-w64-mingw32' instances with 'target' keyword argument.
(cross-gcc-build-phases): Update accordingly; use 'target-mingw?'
implementation of target checking and add commentary.
* gnu/ci.scm (%cross-targets): Add "x86_64-w64-mingw32".
Diffstat (limited to 'gnu/ci.scm')
| -rw-r--r-- | gnu/ci.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index 4885870e16..aeebd4f14b 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -130,7 +130,8 @@ SYSTEM." "aarch64-linux-gnu" "powerpc-linux-gnu" "i586-pc-gnu" ;aka. GNU/Hurd - "i686-w64-mingw32")) + "i686-w64-mingw32" + "x86_64-w64-mingw32")) (define %guixsd-supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) |