diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-05-09 20:50:49 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-05-09 20:50:49 +0000 |
| commit | 2430e9a4f5f809d9164edf64dd3eb87f9a14a5fc (patch) | |
| tree | a9db7664e1d0b5d68f7cff21195352c321e940c9 /toolchain | |
| parent | dc00dbd0857a5bb5202eb8ae2dad97dd59f4bba8 (diff) | |
| download | upstream-2430e9a4f5f809d9164edf64dd3eb87f9a14a5fc.tar.gz upstream-2430e9a4f5f809d9164edf64dd3eb87f9a14a5fc.tar.bz2 upstream-2430e9a4f5f809d9164edf64dd3eb87f9a14a5fc.zip | |
toolchain: eliminate the INSTALL_LIBSTDCPP config symbol and make c++ support mandatory - fixes recursive config symbol dependency issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36594
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Config.in | 7 | ||||
| -rw-r--r-- | toolchain/gcc/common.mk | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index b3fd5d665e..defb1b1b0e 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -71,13 +71,6 @@ config SJLJ_EXCEPTIONS frame unwinding exceptions handling routines. Warning: increases code size and runtime memory usage. -config INSTALL_LIBSTDCPP - bool - prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS - default y if !USE_MUSL - help - Build/install c++ compiler and libstdc++? - config INSTALL_LIBGCJ bool prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 2e10f8dbef..688374e249 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -93,7 +93,7 @@ HOST_STAMP_CONFIGURED:=$(GCC_BUILD_DIR)/.configured HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.gcc_$(GCC_VARIANT)_installed SEP:=, -TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)$(if $(CONFIG_INSTALL_GFORTRAN),$(SEP)fortran)" +TARGET_LANGUAGES:="c,c++$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)$(if $(CONFIG_INSTALL_GFORTRAN),$(SEP)fortran)" export libgcc_cv_fixed_point=no ifdef CONFIG_USE_UCLIBC |