summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2013-08-14 14:06:30 +1000
committerChris Johns <chrisj@rtems.org>2013-08-14 14:06:30 +1000
commit27d6ea0dd1ea965ec399d7d47f306eece1a76a42 (patch)
treec67bfebed63bf53e4a78e70de0ed7faf946b415e
parentconfig: Change to use the GCC POSIX thread model. (diff)
downloadrtems-source-builder-27d6ea0dd1ea965ec399d7d47f306eece1a76a42.tar.bz2
config: Add support for iconv encodings.
Turn off iconv support for the AVR because the arrays are too big.
-rw-r--r--rtems/config/4.11/rtems-avr.bset5
-rw-r--r--source-builder/config/gcc-common-1.cfg1
2 files changed, 6 insertions, 0 deletions
diff --git a/rtems/config/4.11/rtems-avr.bset b/rtems/config/4.11/rtems-avr.bset
index 735dc92..b9104e4 100644
--- a/rtems/config/4.11/rtems-avr.bset
+++ b/rtems/config/4.11/rtems-avr.bset
@@ -29,6 +29,11 @@
%define enable_cxx 0
#
+# Disable building ICONV support
+#
+%define with_iconv 0
+
+#
# Set the build flags to work around the defaults in the
# compiler that cause ICE.
#
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index c63b9ca..5ff2021 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -160,6 +160,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
--disable-lto \
--enable-newlib-io-c99-formats \
%{?with_iconv:--enable-newlib-iconv} \
+ %{?with_iconv:--enable-newlib-iconv-encodings=%{_newlib_iconv_encodings}} \
%{?with_threads:--enable-threads}%{!?with_threads:--disable-threads} \
%{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
%{?enable_obsolete:--enable-obsolete} \