summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-01 18:23:54 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-01 18:26:13 +0100
commit6b16f46b4d465f702ee5cbf65a1895e24d10449e (patch)
treec9af92556233549de1a5d0ad36e022522f582b23
parentbcbb16bbc406b3e0c38fed061538d9a44324b9ae (diff)
downloadembtoolkit-6b16f46b4d465f702ee5cbf65a1895e24d10449e.tar.gz
embtoolkit-6b16f46b4d465f702ee5cbf65a1895e24d10449e.tar.bz2
embtoolkit-6b16f46b4d465f702ee5cbf65a1895e24d10449e.tar.xz
Toolchain: tweak optional programming languages kconfig entries
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--kconfig/compiler-options.kconfig (renamed from kconfig/gcc-options.kconfig)15
-rw-r--r--kconfig/gcc.kconfig7
-rw-r--r--kconfig/toolchain.kconfig7
3 files changed, 8 insertions, 21 deletions
diff --git a/kconfig/gcc-options.kconfig b/kconfig/compiler-options.kconfig
index 4d130c0..e379c8d 100644
--- a/kconfig/gcc-options.kconfig
+++ b/kconfig/compiler-options.kconfig
@@ -1,6 +1,6 @@
################################################################################
# Embtoolkit
-# Copyright(C) 2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
+# Copyright(C) 2012-2013 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,15 +23,8 @@
# \date February 2012
################################################################################
-config EMBTK_GCC_MORE_LANGUAGES
- bool "Support additional languages"
- help
- Additional languages that you wish your toolchain generates
- binaries.
-
config EMBTK_GCC_LANGUAGE_CPP
bool "Support C++"
- depends on EMBTK_GCC_MORE_LANGUAGES
select KEMBTK_UCLIBC_UCLIBC_HAS_FLOATS if EMBTK_CLIB_UCLIBC
select KEMBTK_UCLIBC_UCLIBC_SUSV3_LEGACY if EMBTK_CLIB_UCLIBC
select KEMBTK_UCLIBC_UCLIBC_CTOR_DTOR if EMBTK_CLIB_UCLIBC
@@ -44,33 +37,27 @@ config EMBTK_GCC_LANGUAGE_CPP
#config EMBTK_GCC_LANGUAGE_JAVA
# bool "Support Java"
-# depends on EMBTK_GCC_MORE_LANGUAGES
# help
# Your toolchain will be able to build Java source code
config EMBTK_GCC_LANGUAGE_OBJECTIVEC
bool "Support Objective-C"
- depends on EMBTK_GCC_MORE_LANGUAGES
depends on !EMBTK_CLIB_UCLIBC
help
Your toolchain will be able to build Objective-C source code
config EMBTK_GCC_LANGUAGE_OBJECTIVECPP
bool "Support Objective-C++"
- depends on EMBTK_GCC_MORE_LANGUAGES
depends on !EMBTK_CLIB_UCLIBC
help
Your toolchain will be able to build Objective-C source code
config EMBTK_GCC_LANGUAGE_FORTRAN
bool "Support Fortran"
- depends on EMBTK_GCC_MORE_LANGUAGES
help
Your toolchain will be able to build fortran source code
#config EMBTK_GCC_LANGUAGE_ADA
# bool "Support Ada"
-# depends on EMBTK_GCC_MORE_LANGUAGES
# help
# Your toolchain will be able to build Ada source code
-
diff --git a/kconfig/gcc.kconfig b/kconfig/gcc.kconfig
index 6cce3c2..cb86fe9 100644
--- a/kconfig/gcc.kconfig
+++ b/kconfig/gcc.kconfig
@@ -1,6 +1,6 @@
################################################################################
# Embtoolkit
-# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2013 Abdoulaye Walsimou GAYE.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -152,8 +152,3 @@ config EMBTK_GCC3_NEED_PATCH
bool
config EMBTK_GCC3_NEED_AUTORECONF
bool
-
-#
-# GCC various options (languages to support, etc.)
-#
-source kconfig/gcc-options.kconfig
diff --git a/kconfig/toolchain.kconfig b/kconfig/toolchain.kconfig
index 7245839..4e1720b 100644
--- a/kconfig/toolchain.kconfig
+++ b/kconfig/toolchain.kconfig
@@ -1,6 +1,6 @@
################################################################################
# Embtoolkit
-# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2013 Abdoulaye Walsimou GAYE.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -121,6 +121,11 @@ source kconfig/llvm/llvm.kconfig
source kconfig/llvm/clang.kconfig
endif
+comment "------------------------------------------"
+comment "--- Additional programming languages"
+comment "------------------------------------------"
+source kconfig/compiler-options.kconfig
+
endmenu
menu "Binutils"