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

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 587398d2a82e0b5966a6827d36a1f1d115181b11
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Apr 28 15:03:01 2020 +0200

    gnu: custom-gcc: Ensure #:modules are not overridden by the inherited GCC.
    
    This fixes a regression introduced in 
56c833ea287f8f6d3c72f8bddc314960c0164d64
    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.
---
 gnu/packages/gcc.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index b69f3cf..6566482 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -641,12 +641,12 @@ as the 'native-search-paths' field."
     (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 ","))