guix-commits
[Top][All Lists]
Advanced

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

04/13: gnu: hss: Fix cross-compilation.


From: guix-commits
Subject: 04/13: gnu: hss: Fix cross-compilation.
Date: Sat, 11 Jul 2020 16:04:41 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit f718c0a05d64ac8f86c83ea099e68944254b1959
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sat Jul 11 19:48:12 2020 +0200

    gnu: hss: Fix cross-compilation.
    
    * gnu/packages/ssh.scm (hss)[arguments]: Move $CC to MAKE-FLAGS and use
    CC-FOR-TARGET.  Rename ‘pre-env’ to the more accurate ‘patch-file-names’.
---
 gnu/packages/ssh.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 8d2f1d5..330675f 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -87,17 +87,18 @@
     (inputs
      `(("readline" ,readline)))
     (arguments
-     `(#:tests? #f ;no tests
+     `(#:make-flags
+       (list ,(string-append "CC=" (cc-for-target)))
+       #:tests? #f                      ; no tests
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'set-env
+         (add-after 'unpack 'patch-file-names
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (substitute* "Makefile"
                (("/usr/local/bin")
                 (string-append (assoc-ref outputs "out") "/bin"))
                (("/usr/local/opt/readline")
                 (assoc-ref inputs "readline")))
-             (setenv "CC" "gcc")))
          (delete 'configure))))
     (build-system gnu-build-system)
     (home-page "https://github.com/six-ddc/hss/";)



reply via email to

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