amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.

Browse source 
Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.

The renaming was automated via the command:

  $ git grep -l %gnu-build-system-modules
    | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i

* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this.  Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
This commit is contained in:
Maxim Cournoyer 2023-10-09 11:10:48 -04:00 • committed by Ludovic Courtès
parent 0e881505f1
commit f59df1aa3c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
117 changed files with 205 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/gcc.scm
View file

@ -420,7 +420,7 @@ Go. It also includes runtime support libraries for these languages.")
;; For native builds of some GCC versions the C++ include path needs to
;; be adjusted so it does not interfere with GCC's own build processes.
(substitute-keyword-arguments (package-arguments parent)
((#:modules modules %gnu-build-system-modules)
((#:modules modules %default-gnu-imported-modules)
`((srfi srfi-1)
,@modules))
((#:phases phases)
@ -955,7 +955,7 @@ using compilers other than GCC."
#:out-of-source? #t
#:modules `((srfi srfi-1)
(srfi srfi-26)
,@%gnu-build-system-modules)
,@%default-gnu-imported-modules)
#:phases
#~(modify-phases %standard-phases
#$@(if (version>=? (package-version gcc) "11")
@ -1103,7 +1103,7 @@ as the 'native-search-paths' field."
(native-search-paths search-paths)
(arguments
(substitute-keyword-arguments (package-arguments gcc)
((#:modules modules %gnu-build-system-modules)
((#:modules modules %default-gnu-imported-modules)
`(,@modules
(srfi srfi-1)
(srfi srfi-26)