me/guix
Archived
1
0
Fork 0
Code Activity

gnu: GDB: Inline cross-compilation fix.

Browse source 
* gnu/packages/gdb.scm (gdb-9.1)[arguments]: Remove conditionals on
%CURRENT-TARGET-SYSTEM.
This commit is contained in:
Marius Bakke 2020-06-27 10:32:48 +02:00
parent 425fd7eb6a
commit ef2a3871fd
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/gdb.scm
View file

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