01/02: gnu: gcc: Support objc, objc++ by default.

[guix-commits]

efraim pushed a commit to branch core-updates
in repository guix.

commit d21d596f72ad491937123980e65d3efedc903bd6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Nov 6 11:55:34 2023 +0200

    gnu: gcc: Support objc, objc++ by default.
    
    * 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
---
 gnu/packages/gcc.scm  | 98 +--------------------------------------------------
 guix/search-paths.scm | 14 ++++++++
 2 files changed, 15 insertions(+), 97 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 96e0d81d98..c6b745298c 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -130,7 +130,7 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
             (list 'quasiquote
                   (append
                    '("--enable-plugin"
-                     "--enable-languages=c,c++"
+                     "--enable-languages=c,c++,objc,obj-c++"
                      "--disable-multilib"
                      "--with-system-zlib"
 
@@ -1226,102 +1226,6 @@ provides the GNU compiler for the Go programming 
language."))
 (define-public gccgo-13
   (make-gccgo gcc-13))
 
-(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
diff --git a/guix/search-paths.scm b/guix/search-paths.scm
index a935684952..edd416ccdc 100644
--- a/guix/search-paths.scm
+++ b/guix/search-paths.scm
@@ -35,6 +35,8 @@
 
             $CPLUS_INCLUDE_PATH
             $C_INCLUDE_PATH
+            $OBJC_INCLUDE_PATH
+            $OBJCPLUS_INCLUDE_PATH
             $LIBRARY_PATH
             $GUIX_EXTENSIONS_PATH
             $PATH
@@ -90,6 +92,16 @@
    (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 @@
   ;; 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