1.1 --- a/scripts/build/libc/uClibc.sh	Mon May 11 20:19:50 2009 +0000
     1.2 +++ b/scripts/build/libc/uClibc.sh	Fri Nov 06 20:17:30 2009 +0100
     1.3 @@ -292,14 +292,23 @@
     1.4  ENDSED
     1.5      fi
     1.6  
     1.7 +    # WCHAR support
     1.8 +    if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ] ; then
     1.9 +       cat >>"${munge_file}" <<-ENDSED
    1.10 +s/^.*UCLIBC_HAS_WCHAR.*/UCLIBC_HAS_WCHAR=y/
    1.11 +ENDSED
    1.12 +    else
    1.13 +       cat >>"${munge_file}" <<-ENDSED
    1.14 +s/^.*UCLIBC_HAS_WCHAR.*/UCLIBC_HAS_WCHAR=n/
    1.15 +ENDSED
    1.16 +    fi
    1.17 +
    1.18      # Force on options needed for C++ if we'll be making a C++ compiler.
    1.19      # I'm not sure locales are a requirement for doing C++... Are they?
    1.20      if [ "${CT_CC_LANG_CXX}" = "y" ]; then
    1.21          cat >>"${munge_file}" <<-ENDSED
    1.22  s/^# DO_C99_MATH is not set/DO_C99_MATH=y/
    1.23  s/^# UCLIBC_CTOR_DTOR is not set/UCLIBC_CTOR_DTOR=y/
    1.24 -# Add these three lines when doing C++?
    1.25 -s/^# UCLIBC_HAS_WCHAR is not set/UCLIBC_HAS_WCHAR=y/
    1.26  #s/^# UCLIBC_HAS_LOCALE is not set/UCLIBC_HAS_LOCALE=y\\nUCLIBC_PREGENERATED_LOCALE_DATA=y\\n\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set\\n\\# UCLIBC_HAS_XLOCALE is not set/
    1.27  s/^# UCLIBC_HAS_GNU_GETOPT is not set/UCLIBC_HAS_GNU_GETOPT=y/
    1.28  ENDSED