me
/
guix
Archived
1
0
Fork 0
Code

gnu: gcc@4.7: Update phase style. 

* gnu/packages/gcc.scm (gcc-4.7)[arguments]: Use MODIFY-PHASES syntax
and end phases with #t.
master
Tobias Geerinckx-Rice 2018-02-19 22:51:08 +01:00
parent c0ad84ff1e
commit ba81ca6af3
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 108 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/gcc.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -200,8 +201,8 @@ where the OS part is overloaded to denote a specific ABI---into GCC
#:tests? #f
#:phases
(alist-cons-before
'configure 'pre-configure
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((libdir ,(libdir))
(libc (assoc-ref inputs "libc")))
@ -314,17 +315,17 @@ where the OS part is overloaded to denote a specific ABI---into GCC
;; but there's nothing useful to look for here.)
(substitute* "gcc/config.in"
(("PREFIX_INCLUDE_DIR")
"PREFIX_INCLUDE_DIR_isnt_necessary_here"))))
"PREFIX_INCLUDE_DIR_isnt_necessary_here"))
#t)))
(alist-cons-after
'configure 'post-configure
(add-after 'configure 'post-configure
(lambda _
;; Don't store configure flags, to avoid retaining references to
;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
(substitute* "Makefile"
(("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
"TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))
%standard-phases))))
"TOPLEVEL_CONFIGURE_ARGUMENTS=\n"))
#t)))))
(native-search-paths
;; Use the language-specific variables rather than 'CPATH' because they