From 5cf6c96ad9ffafccf180ec2d44c740b6999c02ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 9 Dec 2023 20:14:43 +0100 Subject: [PATCH] gnu: cross-base: Let glibc use the right Binutils programs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces ‘glibc-cross-objdump.patch’ and ‘glibc-cross-objcopy.patch’ (not applied to glibc@2.38): these patches were committed upstream and later reverted on the grounds that ‘gcc -print-prog-name=objdump’ should find the cross ‘objdump’: https://inbox.sourceware.org/libc-alpha/d72f5f6f-cc3a-bd89-0800-ffb068928e0f@linaro.org/t/ * gnu/packages/cross-base.scm (cross-libc*): Add ‘add-cross-binutils-to-PATH’ phase. Change-Id: I38dc7a6134177ec73313c0a9c8b0a12c85c60e26 --- gnu/packages/cross-base.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 46c70fd432..ff961ca151 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -653,6 +653,22 @@ and the cross tool chain." (setenv "CROSS_LIBRARY_PATH" (string-append kernel "/lib")) ; for Hurd's libihash #t))) + (add-before 'configure 'add-cross-binutils-to-PATH + (lambda* (#:key inputs #:allow-other-keys) + ;; Add BINUTILS/TARGET/bin to $PATH so that 'gcc + ;; -print-prog-name=objdump' returns the correct name. See + ;; . + (define cross-objdump + (search-input-file + inputs + (string-append ,target "/bin/objdump"))) + + (define cross-binutils + (dirname cross-objdump)) + + (format #t "adding '~a' to the front of 'PATH'~%" + cross-binutils) + (setenv "PATH" (string-append cross-binutils ":" (getenv "PATH"))))) ,@(if (target-hurd? target) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys)