diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-08-18 21:24:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:45:47 +0200 |
| commit | 5d6c55d3641005d2939d140a5f533d7565f7404d (patch) | |
| tree | a9077f137d8dfbcee4844381f87b79940c1e4f33 | |
| parent | cbcc06b1d7f6cb33deb441539a67aada691aade0 (diff) | |
| download | guix-5d6c55d3641005d2939d140a5f533d7565f7404d.tar guix-5d6c55d3641005d2939d140a5f533d7565f7404d.tar.gz | |
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
| -rw-r--r-- | gnu/packages/cross-base.scm | 4 |
1 files 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/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/>. (define cross-objdump (search-input-file - inputs + (or native-inputs inputs) (string-append ,target "/bin/objdump"))) (define cross-binutils |