mirror of
https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git
synced 2025-04-29 21:58:36 +02:00
erreur...
This commit is contained in:
parent
b078e8c341
commit
d2b3c8993a
1 changed files with 1 additions and 49 deletions
|
@ -185,61 +185,13 @@
|
|||
)
|
||||
)
|
||||
|
||||
;; pour futures customisations.
|
||||
|
||||
<<<<<<< HEAD
|
||||
(define-public glicid-openmpi
|
||||
(package
|
||||
(inherit openmpi)
|
||||
(name "glicid-openpmi")
|
||||
))
|
||||
=======
|
||||
(define* (custom-gcc gcc name languages
|
||||
#:optional
|
||||
(search-paths (package-native-search-paths gcc))
|
||||
#:key (separate-lib-output? #t))
|
||||
"Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS
|
||||
as the 'native-search-paths' field."
|
||||
(package (inherit gcc)
|
||||
(name name)
|
||||
(outputs (if separate-lib-output?
|
||||
(package-outputs gcc)
|
||||
(delete "lib" (package-outputs gcc))))
|
||||
(native-search-paths search-paths)
|
||||
(properties (alist-delete 'hidden? (package-properties gcc)))
|
||||
(arguments
|
||||
(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 ","))
|
||||
(remove (cut string-match "--enable-languages.*" <>)
|
||||
,flags)))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'install 'remove-broken-or-conflicting-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(for-each delete-file
|
||||
(find-files (string-append (assoc-ref outputs "out") "/bin")
|
||||
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))
|
||||
#t))))))))
|
||||
|
||||
|
||||
(define-public gfortran-9
|
||||
(custom-gcc gcc-9 "gfortran" '("fortran")
|
||||
%generic-search-paths))
|
||||
|
||||
(define-public gfortran-10
|
||||
(custom-gcc gcc-10 "gfortran" '("fortran")
|
||||
%generic-search-paths))
|
||||
|
||||
(define-public glicid-gfortran-9 gfortran-9)
|
||||
(define-public glicid-gfortran-10 gfortran-10)
|
||||
|
||||
>>>>>>> parent of 34257ea... attention, gcc.scm est patché...
|
||||
|
||||
|
||||
;;; glicid.scm ends here
|
||||
|
|
Loading…
Add table
Reference in a new issue