mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-30 22:36:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: linux-libre: Build with GCC-7 on all systems.

Browse source 
* gnu/packages/linux.scm (make-linux-libre)[native-inputs]: Include GCC-7
unconditionally.  Previously it was included only on Intel systems.
Add GMP, MPFR, and MPC.
[arguments]: Add 'work-around-gcc-7-include-path-issue' phase.
This commit is contained in:
Mark H Weaver 2018-12-31 22:33:33 -05:00
parent 3fb7b61250
commit ce899af109
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/linux.scm
View file

@ -306,14 +306,16 @@ (define* (make-linux-libre version hash supported-systems
("elfutils" ,elfutils) ; Needed to enable CONFIG_STACK_VALIDATION ("elfutils" ,elfutils) ; Needed to enable CONFIG_STACK_VALIDATION
("flex" ,flex) ("flex" ,flex)
("bison" ,bison) ("bison" ,bison)
;; On x86, build with GCC-7 for full retpoline support.
;; Build with GCC-7 for full retpoline support.
;; FIXME: Remove this when our default compiler has retpoline support. ;; FIXME: Remove this when our default compiler has retpoline support.
,@(match (system->linux-architecture ("gcc" ,gcc-7)
(or (%current-target-system) (%current-system)))
((or "x86_64" "i386") ;; These are needed to compile the GCC plugins.
`(("gcc" ,gcc-7))) ("gmp" ,gmp)
(_ ("mpfr" ,mpfr)
'())) ("mpc" ,mpc)
,@(match (and configuration-file ,@(match (and configuration-file
(configuration-file (configuration-file
(system->linux-architecture (system->linux-architecture
@ -335,6 +337,11 @@ (define* (make-linux-libre version hash supported-systems
(substitute* (find-files "." "^Makefile(\\.include)?$") (substitute* (find-files "." "^Makefile(\\.include)?$")
(("/bin/pwd") "pwd")) (("/bin/pwd") "pwd"))
#t)) #t))
(add-before 'configure 'work-around-gcc-7-include-path-issue
(lambda _
(unsetenv "C_INCLUDE_PATH")
(unsetenv "CPLUS_INCLUDE_PATH")
#t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs native-inputs target #:allow-other-keys) (lambda* (#:key inputs native-inputs target #:allow-other-keys)
;; Avoid introducing timestamps ;; Avoid introducing timestamps