mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 15:26:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gdb: Apply cross-build fix without changing the native variant.

Browse source 
Commit 76129cd3ed accidentally changed the gdb
derivation, causing too many rebuilds for the 'master' branch.

* gnu/packages/gdb.scm (gdb-9.1)[arguments]: Only apply cross-build fix when
cross-compiling.
This commit is contained in:
Marius Bakke 2020-06-27 10:01:09 +02:00
parent 35691bf5dc
commit 361541d4a5
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/gdb.scm
View file

@ -70,14 +70,20 @@ (define-public gdb-9.1
#t)) #t))
(add-after (add-after
'install 'remove-libs-already-in-binutils 'install 'remove-libs-already-in-binutils
(lambda* (#:key inputs native-inputs outputs (lambda* (#:key inputs outputs
;; TODO: Inline the native-inputs addition and
;; below usage in the next rebuild cycle.
,@(if (%current-target-system)
'(native-inputs)
'())
#:allow-other-keys) #:allow-other-keys)
;; Like Binutils, GDB installs libbfd, libopcodes, etc. ;; Like Binutils, GDB installs libbfd, libopcodes, etc.
;; However, this leads to collisions when both are ;; However, this leads to collisions when both are
;; installed, and really is none of its business, ;; installed, and really is none of its business,
;; conceptually. So remove them. ;; conceptually. So remove them.
(let* ((binutils (or (assoc-ref inputs "binutils") (let* ((binutils ,@(if (%current-target-system)
(assoc-ref native-inputs "binutils"))) '((assoc-ref native-inputs "binutils"))
'((assoc-ref inputs "binutils"))))
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
(files1 (with-directory-excursion binutils (files1 (with-directory-excursion binutils
(append (find-files "lib") (append (find-files "lib")