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

gnu: gcc-static: Make sure #:modules is not overridden by the inherited GCC.

Browse source 
This fixes a regression introduced by 56c833ea28
and 25bc0f34c6 where #:modules became ineffective.

* gnu/packages/make-bootstrap.scm (%gcc-static)[arguments]: Prepend the
required modules to those inherited from GCC-5.  While at it, do not splice in
the inherited arguments.
This commit is contained in:
Marius Bakke 2020-03-28 20:55:03 +01:00
parent aebcbb27bc
commit 313bf502b5
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/make-bootstrap.scm
View file

@ -464,12 +464,12 @@ (define %gcc-static
(name "gcc-static")
(outputs '("out")) ; all in one
(arguments
`(#:modules ((guix build utils)
(guix build gnu-build-system)
(srfi srfi-1)
(substitute-keyword-arguments (package-arguments gcc-5)
((#:modules modules %gnu-build-system-modules)
`((srfi srfi-1)
(srfi srfi-26)
(ice-9 regex))
,@(substitute-keyword-arguments (package-arguments gcc-5)
(ice-9 regex)
,@modules))
((#:guile _) #f)
((#:implicit-inputs? _) #t)
((#:configure-flags flags)
@ -511,7 +511,7 @@ (define %gcc-static
(find-files "gcc/config"
"^gnu-user.*\\.h$"))
((" -lgcc_s}}") "}}"))
#t)))))))
#t))))))
(inputs
`(("zlib:static" ,zlib "static")
("isl:static" ,isl-0.18 "static")