From 0e1bf5714261de8f25baabca3b826284102b6c40 Mon Sep 17 00:00:00 2001
Message-ID: <0e1bf5714261de8f25baabca3b826284102b6c40.1705149527.git.janneke@gnu.org>
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 12 Jan 2024 13:24:14 +0100
Subject: [PATCH 1/3] gnu: gcc: Fix building cross compiler for the Hurd.

This is a follow-up to commit
    d21d596f72ad491937123980e65d3efedc903bd6
    gnu: gcc: Support objc, objc++ by default.

* gnu/packages/gcc.scm (gcc-4.7): Only build c,c++ when building for the Hurd.

Change-Id: I21ce5dd30d7ab253e6a46173eb674b55d6c01505
---
 gnu/packages/gcc.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index ecd88931eb..111b096185 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -132,9 +133,11 @@ (define-public gcc-4.7
             ;; contents of (maybe-target-tools).
             (list 'quasiquote
                   (append
-                   '("--enable-plugin"
-                     "--enable-languages=c,c++,objc,obj-c++"
-                     "--disable-multilib"
+                   '("--enable-plugin")
+                   (if (target-hurd?)
+                       '("--enable-languages=c,c++")
+                       '("--enable-languages=c,c++,objc,obj-c++"))
+                   '("--disable-multilib"
                      "--with-system-zlib"
 
                      ;; No pre-compiled libstdc++ headers, to save space.

base-commit: 8e9573784f06ec2af96f9298c6dd4346688888fb
-- 
2.41.0