From patchwork Wed Aug 28 06:35:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 270365 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B5E002C009E for ; Wed, 28 Aug 2013 16:35:55 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CC9CC8B92C; Wed, 28 Aug 2013 06:35:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id obhwb5fB5Q0u; Wed, 28 Aug 2013 06:35:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 639648B8F5; Wed, 28 Aug 2013 06:35:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 50B431CE62B for ; Wed, 28 Aug 2013 06:35:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C12A520167 for ; Wed, 28 Aug 2013 06:35:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eG-LtY51eLG8 for ; Wed, 28 Aug 2013 06:35:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by silver.osuosl.org (Postfix) with ESMTP id 662AF32912 for ; Wed, 28 Aug 2013 06:35:30 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 8033284A; Wed, 28 Aug 2013 08:35:48 +0200 (CEST) Received: from localhost (AToulouse-651-1-237-65.w90-38.abo.wanadoo.fr [90.38.172.65]) by mail.free-electrons.com (Postfix) with ESMTPSA id 448C6818 for ; Wed, 28 Aug 2013 08:35:48 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Wed, 28 Aug 2013 08:35:25 +0200 Message-Id: <1377671731-28656-7-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377671731-28656-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1377671731-28656-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 06/12] gcc: move C++ support option next to Fortran/Objective-C X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The option to enable C++ support was still located in toolchain/toolchain-buildroot/Config.in.2, with misc other toolchain options. It seems more logical to have this option with the other options to select the languages supported by the cross-compiler, so we move it next to the Fortran/Objective-C options in package/gcc/Config.in.host. Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 13 +++++++++++++ toolchain/toolchain-buildroot/Config.in.2 | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index a7dbbb6..dbf0f20 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -112,6 +112,19 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS include. Those options are applied for all of the gcc initial, gcc intermediate and gcc final passes. +config BR2_TOOLCHAIN_BUILDROOT_CXX + bool "Enable C++ support" + select BR2_INSTALL_LIBSTDCPP + depends on !(BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && \ + BR2_TOOLCHAIN_BUILDROOT_LOCALE) + help + Enable this option if you want your toolchain to support the + C++ language and you want C++ libraries to be installed on + your target system. + +comment "C++ support broken in uClibc with locale enabled with gcc 4.2" + depends on BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && BR2_TOOLCHAIN_BUILDROOT_LOCALE + config BR2_INSTALL_OBJC bool "Enable Objective-C support" depends on !BR2_avr32 diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2 index bf27e6b..1371c31 100644 --- a/toolchain/toolchain-buildroot/Config.in.2 +++ b/toolchain/toolchain-buildroot/Config.in.2 @@ -4,19 +4,6 @@ if BR2_TOOLCHAIN_BUILDROOT comment "Toolchain Options" -config BR2_TOOLCHAIN_BUILDROOT_CXX - bool "Enable C++ support" - select BR2_INSTALL_LIBSTDCPP - depends on !(BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && \ - BR2_TOOLCHAIN_BUILDROOT_LOCALE) - help - Enable this option if you want your toolchain to support the - C++ language and you want C++ libraries to be installed on - your target system. - -comment "C++ support broken in uClibc with locale enabled with gcc 4.2" - depends on BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 && BR2_TOOLCHAIN_BUILDROOT_LOCALE - config BR2_TOOLCHAIN_BUILDROOT_USE_SSP bool "Enable stack protection support" help