me
/
guix
Archived
1
0
Fork 0
Code

gnu: custom-gcc: Ensure #:modules are not overridden by the inherited GCC. 

This fixes a regression introduced in 56c833ea28
where the #:modules argument became ineffective.  Reported by Efraim Flashner
in <https://lists.gnu.org/archive/html/guix-devel/2020-04/msg00473.html>

* gnu/packages/gcc.scm (custom-gcc)[arguments]: Add #:modules through
SUBSTITUTE-KEYWORD-ARGUMENTS.
master
Marius Bakke 2020-04-28 15:03:01 +02:00
parent a7a8337b28
commit 587398d2a8
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gcc.scm
View File

@ -641,12 +641,12 @@ as the 'native-search-paths' field."
(native-search-paths search-paths) (native-search-paths search-paths)
(properties (alist-delete 'hidden? (package-properties gcc))) (properties (alist-delete 'hidden? (package-properties gcc)))
(arguments (arguments
(substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) (substitute-keyword-arguments (package-arguments gcc)
(guix build utils) ((#:modules modules %gnu-build-system-modules)
(ice-9 regex) `(,@modules
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26)
,@(package-arguments gcc)) (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 ","))