02/02: gnu: openssh: Fix cross-compilation.

[guix-commits]

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

commit 3d8c77836b73ae8284c673eabdae7f0880d70a8d
Author: Mathieu Othacehe <address@hidden>
Date:   Thu Dec 26 18:09:32 2019 +0100

    gnu: openssh: Fix cross-compilation.
    
    * gnu/packages/ssh.scm (openssh): Pass --disable-strip argument when
    cross-compiling.
---
 gnu/packages/ssh.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index de33eff..7abf710 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2017 ng0 <address@hidden>
 ;;; Copyright © 2018 Manuel Graf <address@hidden>
 ;;; Copyright © 2019 Gábor Boskovits <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -165,7 +166,15 @@ a server that supports the SSH-2 protocol.")
                           "--with-libedit"
 
                           ;; Enable PAM support in sshd.
-                          "--with-pam")
+                          "--with-pam"
+
+                          ;; "make install" runs "install -s" by default,
+                          ;; which doesn't work for cross-compiled binaries
+                          ;; because it invokes 'strip' instead of
+                          ;; 'TRIPLET-strip'.  Work around this.
+                          ,,@(if (%current-target-system)
+                                 '("--disable-strip")
+                                 '()))
 
       #:phases
       (modify-phases %standard-phases