diff options
author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-07-02 15:22:16 +0200 |
---|---|---|
committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-11-15 17:32:25 +0100 |
commit | 534537e2efd7ff3d521a0c4cc60170a126d9c9f3 (patch) | |
tree | 2536882fd7ac19c8ed2a652a625f11a0cad14aea /guix/build-system | |
parent | bdcdd55000c61f46649164fe43289f33c6132417 (diff) | |
download | gnu-guix-534537e2efd7ff3d521a0c4cc60170a126d9c9f3.tar gnu-guix-534537e2efd7ff3d521a0c4cc60170a126d9c9f3.tar.gz |
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-minimal-cross): New package.
* guix/build-system/cmake.scm (default-cmake): Add new target argument and use
it to select cmake-minimal or cmake-minimal-cross.
(lower): Pass target to default-cmake.
Diffstat (limited to 'guix/build-system')
-rw-r--r-- | guix/build-system/cmake.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ca88fadddf..aa0f4187ec 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -43,16 +43,19 @@ `((guix build cmake-build-system) ,@%gnu-build-system-modules)) -(define (default-cmake) +(define (default-cmake target) "Return the default CMake package." ;; Do not use `@' to avoid introducing circular dependencies. (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake-minimal))) + (module-ref module + (if target + 'cmake-minimal-cross + 'cmake-minimal)))) (define* (lower name #:key source inputs native-inputs outputs system target - (cmake (default-cmake)) + (cmake (default-cmake target)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." |