From 97b465feb1e4742a8a85fd9b835d32b7acfe8b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 13 Jun 2014 17:57:41 +0200
Subject: [PATCH] gnu: make-bootstrap: Build libstdc++ in '%gcc-static'.

* gnu/packages/make-bootstrap.scm (%gcc-static): Re-enable C++.
---
 gnu/packages/make-bootstrap.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index eeceb15db3..e50d56ed92 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -412,9 +412,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                        ;; Make sure '-static' is passed where it matters.
                        "--with-stage1-ldflags=-static"
 
+                       ;; GCC 4.8+ requires a C++ compiler and library.
+                       "--enable-languages=c,c++"
+
                        "--disable-shared"
                        "--disable-plugin"
-                       "--enable-languages=c"
                        "--disable-libmudflap"
                        "--disable-libatomic"
                        "--disable-libsanitizer"