[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: gnu: shadow: Fix cross-compilation.
|
From: |
Ludovic Courtès |
|
Subject: |
03/04: gnu: shadow: Fix cross-compilation. |
|
Date: |
Tue, 11 Jul 2017 17:59:58 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit ce6223e68e339f6917c636a194df3dfa95991e74
Author: Ludovic Courtès <address@hidden>
Date: Tue Jul 11 22:40:27 2017 +0200
gnu: shadow: Fix cross-compilation.
* gnu/packages/admin.scm (shadow)[arguments] <set-nscd-file-name>: Refer
to "cross-libc" when cross-compiling.
---
gnu/packages/admin.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 22b19a7..319a34a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -306,7 +306,7 @@ hostname.")
"0hdpai78n63l3v3fgr3kkiqzhd0awrpfnnzz4mf7lmxdh61qb37w"))))
(build-system gnu-build-system)
(arguments
- '(;; Assume System V `setpgrp (void)', which is the default on GNU
+ `(;; Assume System V `setpgrp (void)', which is the default on GNU
;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
#:configure-flags
'("--with-libpam" "ac_cv_func_setpgrp_void=yes")
@@ -316,7 +316,10 @@ hostname.")
(add-before 'build 'set-nscd-file-name
(lambda* (#:key inputs #:allow-other-keys)
;; Use the right file name for nscd.
- (let ((libc (assoc-ref inputs "libc")))
+ (let ((libc (assoc-ref inputs
+ ,(if (%current-target-system)
+ "cross-libc"
+ "libc"))))
(substitute* "lib/nscd.c"
(("/usr/sbin/nscd")
(string-append libc "/sbin/nscd"))))))