diff options
Diffstat (limited to 'gnu/packages/gcc.scm')
| -rw-r--r-- | gnu/packages/gcc.scm | 156 |
1 files changed, 48 insertions, 108 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 0c5be69fbf..9ff5e3d7c0 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -687,48 +687,16 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) -(define-public gfortran-4.8 - (hidden-package - (custom-gcc gcc-4.8 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-4.9 - (hidden-package - (custom-gcc gcc-4.9 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-5 - (hidden-package - (custom-gcc gcc-5 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-6 - (hidden-package - (custom-gcc gcc-6 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-7 - (hidden-package - (custom-gcc gcc-7 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-8 +(define-public gfortran (hidden-package - (custom-gcc gcc-8 "gfortran" '("fortran") + (custom-gcc gcc "gfortran" '("fortran") %generic-search-paths))) -(define-public gfortran-9 +(define-public gdc-10 (hidden-package - (custom-gcc gcc-9 "gfortran" '("fortran") + (custom-gcc gcc-10 "gdc" '("d") %generic-search-paths))) -(define-public gfortran - ;; Note: Update this when GCC changes! We cannot use - ;; (custom-gcc gcc "fortran" …) because that would lead to a package object - ;; that is not 'eq?' with GFORTRAN-5, and thus 'fold-packages' would - ;; report two gfortran@5 that are in fact identical. - gfortran-7) - (define-public libgccjit (package (inherit gcc-9) @@ -765,115 +733,87 @@ as the 'native-search-paths' field." ;; a cyclic dependency. <http://debbugs.gnu.org/18101> #:separate-lib-output? #f)) +(define %objc-search-paths + (list (search-path-specification + (variable "OBJC_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + (define-public gcc-objc-4.8 (custom-gcc gcc-4.8 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-4.9 (custom-gcc gcc-4.9 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-5 (custom-gcc gcc-5 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-6 (custom-gcc gcc-6 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-7 (custom-gcc gcc-7 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) (define-public gcc-objc-8 (custom-gcc gcc-8 "gcc-objc" '("objc") - (list (search-path-specification - (variable "OBJC_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc-search-paths)) + +(define-public gcc-objc-9 + (custom-gcc gcc-9 "gcc-objc" '("objc") + %objc-search-paths)) + +(define-public gcc-objc-10 + (custom-gcc gcc-10 "gcc-objc" '("objc") + %objc-search-paths)) (define-public gcc-objc gcc-objc-7) +(define %objc++-search-paths + (list (search-path-specification + (variable "OBJCPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) + (define-public gcc-objc++-4.8 (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-4.9 (custom-gcc gcc-4.9 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-5 (custom-gcc gcc-5 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-6 (custom-gcc gcc-6 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-7 (custom-gcc gcc-7 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) (define-public gcc-objc++-8 (custom-gcc gcc-8 "gcc-objc++" '("obj-c++") - (list (search-path-specification - (variable "OBJCPLUS_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64")))))) + %objc++-search-paths)) + +(define-public gcc-objc++-9 + (custom-gcc gcc-9 "gcc-objc++" '("obj-c++") + %objc++-search-paths)) + +(define-public gcc-objc++-10 + (custom-gcc gcc-10 "gcc-objc++" '("obj-c++") + %objc++-search-paths)) (define-public gcc-objc++ gcc-objc++-7) |