guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: mingetty: Fix cross-compilation.


From: guix-commits
Subject: 01/01: gnu: mingetty: Fix cross-compilation.
Date: Fri, 3 Jan 2020 10:05:10 -0500 (EST)

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

commit ba0e14061aab502999c29b71412b8dd7e6b00bac
Author: Mathieu Othacehe <address@hidden>
Date:   Fri Jan 3 16:00:44 2020 +0100

    gnu: mingetty: Fix cross-compilation.
    
    * gnu/packages/admin.scm (mingetty)[arguments]: When cross-compiling, set CC
    to the appropriate value in configure phase.
---
 gnu/packages/admin.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 1725f2a..81f9f3b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -29,7 +29,7 @@
 ;;; Copyright © 2019 Hartmut Goebel <address@hidden>
 ;;; Copyright © 2019 Alex Griffin <address@hidden>
 ;;; Copyright © 2019 Guillaume Le Vaillant <address@hidden>
-;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2019, 2020 Mathieu Othacehe <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -520,13 +520,17 @@ login, passwd, su, groupadd, and useradd.")
      `(#:phases
        (modify-phases %standard-phases
          (replace 'configure
-           (lambda* (#:key inputs outputs #:allow-other-keys)
+           (lambda* (#:key inputs outputs target #:allow-other-keys)
              (let* ((out    (assoc-ref outputs "out"))
                     (man8   (string-append out "/share/man/man8"))
                     (sbin   (string-append out "/sbin"))
                     (shadow (assoc-ref inputs "shadow"))
                     (login  (string-append shadow "/bin/login")))
                (substitute* "Makefile"
+                 ,@(if (%current-target-system)
+                       '((("CC=.*$")
+                          (string-append "CC=" target "-gcc\n")))
+                       '())
                  (("^SBINDIR.*")
                   (string-append "SBINDIR = " out
                                  "/sbin\n"))



reply via email to

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