me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gcc: Change custom-gcc to use gexp's.

Browse source 
As this seems to be generating broken derivations for i586-gnu otherwise.

* gnu/packages/gcc.scm (custom-gcc): Use gexp's for the generated package
arguments.
This commit is contained in:
Christopher Baines 2023-05-11 15:54:09 +01:00
parent 69d74e35b2
commit ded8cdbe89
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/gcc.scm
View file

@ -1043,18 +1043,18 @@ as the 'native-search-paths' field."
(srfi srfi-26) (srfi srfi-26)
(ice-9 regex))) (ice-9 regex)))
((#:configure-flags flags) ((#:configure-flags flags)
`(cons (string-append "--enable-languages=" #~(cons (string-append "--enable-languages="
,(string-join languages ",")) #$(string-join languages ","))
(remove (cut string-match "--enable-languages.*" <>) (remove (cut string-match "--enable-languages.*" <>)
,flags))) #$flags)))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'install 'remove-broken-or-conflicting-files (add-after 'install 'remove-broken-or-conflicting-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(for-each (for-each
delete-file delete-file
(find-files (string-append (assoc-ref outputs "out") "/bin") (find-files (string-append (assoc-ref outputs "out") "/bin")
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$")))))))))) ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$"))))))))))
(define %generic-search-paths (define %generic-search-paths
;; This is the language-neutral search path for GCC. Entries in $CPATH are ;; This is the language-neutral search path for GCC. Entries in $CPATH are