nckx pushed a commit to branch master
in repository guix.
commit b97b8b44ca34d2a6282dd90ab96957d650840dc5
Author: Tobias Geerinckx-Rice <[email protected]>
AuthorDate: Thu Jun 11 17:42:32 2020 +0200
gnu: progress: Fix cross-compilation.
* gnu/packages/admin.scm (progress)[arguments]: Use CC-FOR-TARGET and a
target-specific pkg-config when cross-compiling.
---
gnu/packages/admin.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9c5ab3b..d348645 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -231,8 +231,14 @@ usual file attributes can be checked for inconsistencies.")
`(("ncurses" ,ncurses)))
(arguments
`(#:tests? #f ; no test suite
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list ,(string-append "CC=" (cc-for-target))
+ (string-append "PKG_CONFIG="
+ (if target
+ (string-append target "-pkg-config")
+ "pkg-config"))
+ (string-append "PREFIX=" (assoc-ref %outputs "out"))))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script