ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcc: Support objc, objc++ by default.

Browse source 
* gnu/packages/gcc.scm (gcc-4.7)[configure-flags]: Adjust the
enable-languages flag to also enable objc, obj-c++.
(gcc-objc-4.8, gcc-objc-4.9, gcc-objc-5, gcc-objc-6, gcc-objc-7,
gcc-objc-8, gcc-objc-9, gcc-objc-10, gcc-objc-11, gcc-objc-12, gcc-objc,
gcc-objc++-4.8, gcc-objc++-4.9, gcc-objc++-5, gcc-objc++-6,
gcc-objc++-7, gcc-objc++-8, gcc-objc++-9, gcc-objc++-10, gcc-objc++-11,
gcc-objc++-12, gcc-objc++, %objc-search-paths, %objc++-search-paths):
Remove variables.
* guix/search-paths.scm ($OBJC_INCLUDE_PATH, $OBJCPLUS_INCLUDE_PATH):
New variables.
(%gcc-search-paths): Include $OBJC_INCLUDE_PATH, $OBJCPLUS_INCLUDE_PATH.

Change-Id: Ib4cd176eb88c733a82f2d31e8cc45b9c61720f8f
This commit is contained in:
Efraim Flashner 2023-11-06 11:55:34 +02:00 committed by Ludovic Courtès
parent b6d23fa9c2
commit 0c9811497e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 15 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
gnu/packages/gcc.scm
View file

@ -134,7 +134,7 @@ (define-public gcc-4.7
(list 'quasiquote
(append
'("--enable-plugin"
"--enable-languages=c,c++"
"--enable-languages=c,c++,objc,obj-c++"
"--disable-multilib"
"--with-system-zlib"
@ -1326,102 +1326,6 @@ (define-public gccgo-13
(define-public gccgo-14
(make-gccgo gcc-14))
(define %objc-search-paths
(list (search-path-specification
(variable "OBJC_INCLUDE_PATH")
(files '("include")))
$LIBRARY_PATH))
(define-public gcc-objc-4.8
(custom-gcc gcc-4.8 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc-4.9
(custom-gcc gcc-4.9 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc-5
(custom-gcc gcc-5 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc-6
(custom-gcc gcc-6 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc-7
(custom-gcc gcc-7 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc-8
(custom-gcc gcc-8 "gcc-objc" '("objc")
%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-11
(custom-gcc gcc-11 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc-12
(custom-gcc gcc-12 "gcc-objc" '("objc")
%objc-search-paths))
(define-public gcc-objc gcc-objc-11)
(define %objc++-search-paths
(list (search-path-specification
(variable "OBJCPLUS_INCLUDE_PATH")
(files '("include")))
$LIBRARY_PATH))
(define-public gcc-objc++-4.8
(custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++-4.9
(custom-gcc gcc-4.9 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++-5
(custom-gcc gcc-5 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++-6
(custom-gcc gcc-6 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++-7
(custom-gcc gcc-7 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++-8
(custom-gcc gcc-8 "gcc-objc++" '("obj-c++")
%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++-11
(custom-gcc gcc-11 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++-12
(custom-gcc gcc-12 "gcc-objc++" '("obj-c++")
%objc++-search-paths))
(define-public gcc-objc++ gcc-objc++-11)
(define (make-libstdc++-doc gcc)
"Return a package with the libstdc++ documentation for GCC."
(package

14
guix/search-paths.scm
View file

@ -35,6 +35,8 @@ (define-module (guix search-paths)
$CPLUS_INCLUDE_PATH
$C_INCLUDE_PATH
$OBJC_INCLUDE_PATH
$OBJCPLUS_INCLUDE_PATH
$LIBRARY_PATH
$GUIX_EXTENSIONS_PATH
$PATH
@ -90,6 +92,16 @@ (define $CPLUS_INCLUDE_PATH
(variable "C_INCLUDE_PATH")
(files '("include"))))
(define $OBJC_INCLUDE_PATH
(search-path-specification
(variable "OBJC_INCLUDE_PATH")
(files '("include"))))
(define $OBJCPLUS_INCLUDE_PATH
(search-path-specification
(variable "OBJCPLUS_INCLUDE_PATH")
(files '("include"))))
(define $LIBRARY_PATH
(search-path-specification
(variable "LIBRARY_PATH")
@ -103,6 +115,8 @@ (define %gcc-search-paths
;; the typical /usr/include headers on an FHS system.
(list $C_INCLUDE_PATH
$CPLUS_INCLUDE_PATH
$OBJC_INCLUDE_PATH
$OBJCPLUS_INCLUDE_PATH
$LIBRARY_PATH))
(define $PATH