diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-19 00:04:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-19 00:04:32 +0100 |
| commit | 35ed83beae51c05069ed6754dd26cf0f549808ab (patch) | |
| tree | fe09aa72524081aa54c74e6d5f99f1a1c006c06b /gnu/packages/assembly.scm | |
| parent | 38f4c54d7e212fd26e6899fad29c2e604abb32f5 (diff) | |
| parent | 0305bc91762f9d5e01abd3d55e8dd9d3d1ecbdad (diff) | |
| download | guix-35ed83beae51c05069ed6754dd26cf0f549808ab.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/assembly.scm')
| -rw-r--r-- | gnu/packages/assembly.scm | 14 |
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 |