TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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.
This commit is contained in:
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 @@ (define* (custom-gcc gcc name languages
(native-search-paths search-paths)
(properties (alist-delete 'hidden? (package-properties gcc)))
(arguments
(substitute-keyword-arguments `(#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 regex)
(srfi srfi-1)
(srfi srfi-26))
,@(package-arguments gcc))
(substitute-keyword-arguments (package-arguments gcc)
((#:modules modules %gnu-build-system-modules)
`(,@modules
(srfi srfi-1)
(srfi srfi-26)
(ice-9 regex)))
((#:configure-flags flags)
`(cons (string-append "--enable-languages="
,(string-join languages ","))