From 0bff68e44d65493bad50b6c07e7c1cfc93846986 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 24 Aug 2021 23:54:14 +0200 Subject: gnu: heimdal: Use the cross-compiled bash in "su". * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Replace _PATH_BSHELL with the cross-compiled bin/sh when cross-compiling. --- gnu/packages/kerberos.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 9afc6a363f..126cdf4342 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -240,9 +240,15 @@ (define-public heimdal '(#:key inputs #:allow-other-keys) '_) ,@(if (%current-target-system) - '((substitute* '("appl/afsutil/pagsh.c") + '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") (("/bin/sh") - (search-input-file inputs "bin/sh"))) + (search-input-file inputs "bin/sh")) + ;; Use the cross-compiled bash instead of the + ;; native bash (XXX shouldn't _PATH_BSHELL point + ;; to a cross-compiled bash?). + (("_PATH_BSHELL") + (string-append + "\"" (search-input-file inputs "bin/sh") "\""))) (substitute* '("tools/Makefile.in") (("/bin/sh") (which "sh")))) '((substitute* '("appl/afsutil/pagsh.c" -- cgit v1.2.3