summaryrefslogtreecommitdiff
path: root/kconfig
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-02-14 21:59:12 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-02-14 21:59:12 +0100
commit58656c201cbb92609bb3af483e4a40ac35fd3b89 (patch)
treea42ed26d55e3722cf1bc934a88c6617215f17fb7 /kconfig
parentb838ea30eadd01fdb6a96cfb6c1a97b81b92806f (diff)
downloadembtoolkit-58656c201cbb92609bb3af483e4a40ac35fd3b89.tar.gz
embtoolkit-58656c201cbb92609bb3af483e4a40ac35fd3b89.tar.bz2
embtoolkit-58656c201cbb92609bb3af483e4a40ac35fd3b89.tar.xz
Toolchain: llvm cross compiler: libcxx: give ability build it when mips32 is used
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'kconfig')
-rw-r--r--kconfig/compiler-options.kconfig12
-rw-r--r--kconfig/libc++/libc++/libcxx.kconfig2
-rw-r--r--kconfig/libc++/libcxxrt/libcxxrt.kconfig22
3 files changed, 24 insertions, 12 deletions
diff --git a/kconfig/compiler-options.kconfig b/kconfig/compiler-options.kconfig
index 73d0d6a..62a827a 100644
--- a/kconfig/compiler-options.kconfig
+++ b/kconfig/compiler-options.kconfig
@@ -40,15 +40,25 @@ choice
help
Here you can choose which GCC series you want to use.
- config EMBTK_CXXLIB_LIBSTDCXX
+ config EMBTK_CXXLIB_GCC_LIBSTDCXX
bool "GCC libstdc++"
help
GCC C++ standard library implementation, under GPLv3 with
runtime exception (see http://gcc.gnu.org/onlinedocs for more
details).
+ config EMBTK_CXXLIB_LLVM_LIBCXX
+ bool "LLVM libc++"
+ depends on (EMBTK_LLVM_ONLY_TOOLCHAIN || EMBTK_GCC_AND_LLVM_TOOLCHAIN) && (EMBTK_ARCH_MIPS && EMBTK_TARGET_ARCH_32BITS)
+ help
+ LLVM C++ standard library implementation, under
+ the MIT license and the UIUC License (a BSD-like license).
+ See http://libcxx.llvm.org
endchoice
+source "kconfig/libc++/libc++/libcxx.kconfig"
+source "kconfig/libc++/libcxxrt/libcxxrt.kconfig"
+
#config EMBTK_GCC_LANGUAGE_JAVA
# bool "Support Java"
# help
diff --git a/kconfig/libc++/libc++/libcxx.kconfig b/kconfig/libc++/libc++/libcxx.kconfig
index d9e105f..a1ee444 100644
--- a/kconfig/libc++/libc++/libcxx.kconfig
+++ b/kconfig/libc++/libc++/libcxx.kconfig
@@ -26,6 +26,7 @@
config EMTK_HAVE_LIBCXX
bool
default y
+ depends on EMBTK_CXXLIB_LLVM_LIBCXX
select KEMBTK_UCLIBC_UCLIBC_HAS_LOCALE if EMBTK_CLIB_UCLIBC
select KEMBTK_UCLIBC_UCLIBC_HAS_XLOCALE if EMBTK_CLIB_UCLIBC
@@ -34,6 +35,7 @@ config EMTK_HAVE_LIBCXX
#
choice
prompt "Version of libcxx you wish"
+ depends on EMTK_HAVE_LIBCXX
help
Version of libcxx you wish
diff --git a/kconfig/libc++/libcxxrt/libcxxrt.kconfig b/kconfig/libc++/libcxxrt/libcxxrt.kconfig
index 218125e..8d0232a 100644
--- a/kconfig/libc++/libcxxrt/libcxxrt.kconfig
+++ b/kconfig/libc++/libcxxrt/libcxxrt.kconfig
@@ -25,22 +25,22 @@
config EMTK_HAVE_LIBCXXRT
bool
+ depends on EMBTK_CXXLIB_LLVM_LIBCXX
+ select EMBTK_LIBCXXRT_VERSION_4_0_10
default y
#
# libcxxrt version
#
-choice
- prompt "Version of libcxxrt you wish"
- help
- Version of libcxxrt you wish
+config EMBTK_LIBCXXRT_VERSION_4_0_10
+ bool
+ select EMBTK_LIBCXXRT_NEED_PATCH
- config EMBTK_LIBCXXRT_VERSION_GIT
- bool "Use libcxxrt git repository"
- help
- Answer Y here if you want to build your toolchain based on
- libcxxrt sources from its GIT repository.
-endchoice
+config EMBTK_LIBCXXRT_VERSION_GIT
+ bool
+ help
+ Answer Y here if you want to build your toolchain based on
+ libcxxrt sources from its GIT repository.
#
# GIT repository options
@@ -67,9 +67,9 @@ config EMBTK_LIBCXXRT_REFSPEC
#
config EMBTK_LIBCXXRT_VERSION_STRING
string
+ default "4.0.10" if EMBTK_LIBCXXRT_VERSION_4_0_10
default "git" if EMBTK_LIBCXXRT_VERSION_GIT
-
config EMBTK_LIBCXXRT_NEED_PATCH
bool
config EMBTK_LIBCXXRT_NEED_AUTORECONF