From 98908e0777889aeec2796dbdc4f0809a1898dd3b Mon Sep 17 00:00:00 2001 From: Rutherther via Guix-patches via Date: Wed, 11 Dec 2024 20:35:45 +0100 Subject: gnu: gdb: Fix build of target-specific versions. Since recently there has been a change to gdb package that introduced configure-flags, three gdb packages broke, since they assumed there are no configure-flags in gdb. That means they produced the same gdb as gdb-14. This patche fixes that by ensuring configure-flags are appended to original package. * gnu/packages/embedded.scm (make-gdb-arm-none-eabi)[arguments]: Append configure-flags to original flags. * gnu/packages/gdb.scm (gdb-multiarch)[arguments]: Likewise. * gnu/packages/gdb.scm (avr-gdb)[arguments]: Likewise. Signed-off-by: Janneke Nieuwenhuizen Change-Id: Ia8748b86dc72197bd4eef307d091b6af44fc5611 --- gnu/packages/embedded.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/embedded.scm') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 0dcfc6669f7..930857d0aa7 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -741,12 +741,14 @@ languages are C and C++.") (inherit gdb) (name "gdb-arm-none-eabi") (arguments - `(#:configure-flags '("--target=arm-none-eabi" - "--enable-multilib" - "--enable-interwork" - "--enable-languages=c,c++" - "--disable-nls") - ,@(package-arguments gdb)))))) + (substitute-keyword-arguments (package-arguments gdb) + ((#:configure-flags flags '()) + #~(cons* "--target=arm-none-eabi" + "--enable-multilib" + "--enable-interwork" + "--enable-languages=c,c++" + "--disable-nls" + #$flags))))))) (define-public libjaylink (package -- cgit v1.3