civodul pushed a commit to branch core-updates
in repository guix.
commit 37e512d2927e22ae9ca5b62283ea6a52cf7e683f
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sun Aug 18 21:24:48 2024 +0200
gnu: cross-base: Adjust ‘cross-libc’ for use as non-native input.
When ‘cross-libc’ is used in a context where it’s not a native input, as
is the case with ‘package-with-relocatable-glibc’ when cross-compiling,
the target objdump is to be found in the native inputs.
* gnu/packages/cross-base.scm (cross-libc*): In
‘add-cross-binutils-to-PATH’ phase, look for TARGET’s objdump in
NATIVE-INPUTS in addition to INPUTS.
Change-Id: Ic0e9ee720cf4211edc95be59903b4bd1d94b1e3f
---
gnu/packages/cross-base.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index d62997144d..cecc21083e 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -716,13 +716,13 @@ returned."
(string-append kernel "/lib")) ; for Hurd's
libihash
#t)))
(add-before 'configure 'add-cross-binutils-to-PATH
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc
;; -print-prog-name=objdump' returns the correct name. See
;;
<https://inbox.sourceware.org/libc-alpha/[email protected]/t/>.
(define cross-objdump
(search-input-file
- inputs
+ (or native-inputs inputs)
(string-append ,target "/bin/objdump")))
(define cross-binutils
