01/08: gnu: http-parser: Fix cross-compilation.

[guix-commits]

mothacehe pushed a commit to branch wip-cross-system
in repository guix.

commit abda4a1f04b8c3ce21627ff9541e8240b578330e
Author: Mathieu Othacehe <address@hidden>
Date:   Mon Jul 1 15:31:48 2019 +0200

    gnu: http-parser: Fix cross-compilation.
    
    * gnu/packages/web.scm (http-parser)[arguments]: Set CC and AR variables in
    Makefile in order to fix cross-compilation.
---
 gnu/packages/web.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 1d9190e..589997e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2019 Nicolas Goaziou <address@hidden>
 ;;; Copyright © 2019 Brendan Tildesley <address@hidden>
 ;;; Copyright © 2019 Alex Griffin <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5171,10 +5172,18 @@ into your tests.  It automatically starts up a HTTP 
server in a separate thread
        #:make-flags
        (list (string-append "PREFIX="
                             (assoc-ref %outputs "out"))
-             "CC=gcc" "library")
+             "library")
        #:phases
        (modify-phases %standard-phases
-         (delete 'configure))))
+         (replace 'configure
+           (lambda* (#:key target #:allow-other-keys)
+             (when ,(%current-target-system)
+               (substitute* (find-files "." "Makefile")
+                 (("CC\\?=.*$")
+                  (string-append "CC=" target "-gcc\n"))
+                 (("AR\\?=.*$")
+                  (string-append "AR=" target "-ar\n"))))
+             #t)))))
     (synopsis "HTTP request/response parser for C")
     (description "This is a parser for HTTP messages written in C.  It parses
 both requests and responses.  The parser is designed to be used in