aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-11-16 11:59:40 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-11-16 13:02:56 +0200
commit59775c1c799abce200a14fef3f2b78a6cfc890a8 (patch)
tree97f50df5b58de02b364b50bedcb374a82e89b3ef /gnu
parentf6a42ac946edccc7de5e93ee247487cbec40072b (diff)
downloadguix-59775c1c799abce200a14fef3f2b78a6cfc890a8.tar.gz
guix-59775c1c799abce200a14fef3f2b78a6cfc890a8.zip
gnu: rgbds: Cross compile.
* gnu/packages/assembly.scm (rgbds)[arguments]: Use cc-for-target in make-flags. Add custom phase to use correct pkg-config for target.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/assembly.scm14
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 7cd45cca9d..7fd469e950 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Andy Tai <atai@atai.org>
@@ -51,7 +51,7 @@
#:use-module (gnu packages shells)
#:use-module (gnu packages xml)
#:use-module ((guix utils)
- #:select (%current-system)))
+ #:select (%current-system cc-for-target)))
(define-public nasm
(package
@@ -276,13 +276,21 @@ runtime")
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
+ (add-after 'unpack 'patch-pkg-config
+ (lambda _
+ (substitute* "Makefile"
+ (("pkg-config")
+ (or (which "pkg-config")
+ (string-append ,(%current-target-system)
+ "-pkg-config"))))
+ #t))
(replace 'check
(lambda _
(with-directory-excursion "test/asm"
(invoke "./test.sh"))
(with-directory-excursion "test/link"
(invoke "./test.sh")))))
- #:make-flags `("CC=gcc"
+ #:make-flags `(,(string-append "CC=" ,(cc-for-target))
,(string-append "PREFIX="
(assoc-ref %outputs "out")))))
(native-inputs