guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: gnu: iw: Fix cross-compilation.


From: guix-commits
Subject: 01/03: gnu: iw: Fix cross-compilation.
Date: Mon, 16 Dec 2019 10:33:23 -0500 (EST)

mothacehe pushed a commit to branch core-updates
in repository guix.

commit 2e4c2a3ae9297e86f3665cbb89e6cb8113360f3a
Author: Mathieu Othacehe <address@hidden>
Date:   Mon Dec 16 12:39:18 2019 +0100

    gnu: iw: Fix cross-compilation.
    
    * gnu/packages/linux.scm (iw)[arguments]: Set PKG_CONFIG and CC variables
    correctly for cross-compilation.
---
 gnu/packages/linux.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index fb9be39..a81905d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2098,8 +2098,18 @@ configuration and monitoring interfaces.")
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("libnl" ,libnl)))
     (arguments
-     `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
-                          "CC=gcc")
+     `(#:make-flags
+       (let* ((target ,(%current-target-system))
+              (gcc (if target (string-append target "-gcc") "gcc"))
+              (pkg-config (if target
+                              (string-append target "-pkg-config")
+                              "pkg-config")))
+         (list
+          (string-append "CC=" gcc)
+          (string-append "PKG_CONFIG="
+                         (assoc-ref %build-inputs "pkg-config")
+                         "/bin/" pkg-config)
+          (string-append "PREFIX=" (assoc-ref %outputs "out"))))
        #:phases (modify-phases %standard-phases (delete 'configure))))
     (home-page "https://wireless.wiki.kernel.org/";)
     (synopsis "Tool for configuring wireless devices")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]