diff options
| author | Keith Packard <keithp@keithp.com> | 2023-04-03 13:32:13 -0700 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2023-04-19 15:13:55 +1200 |
| commit | 06faf2002e547fbaab53ffb2daac8b83238bc169 (patch) | |
| tree | da45b03ffa5a02ade8d7db1ef177d640a9567ee4 | |
| parent | 7e39f11421f7f92f072b0287881164e44b62d79f (diff) | |
| download | crosstool-ng-06faf2002e547fbaab53ffb2daac8b83238bc169.tar.gz crosstool-ng-06faf2002e547fbaab53ffb2daac8b83238bc169.tar.bz2 crosstool-ng-06faf2002e547fbaab53ffb2daac8b83238bc169.zip | |
picolibc: Don't disable libstdc++ wchar_t for 1.8.1 or newer
Picolibc 1.8.1 has wchar_t stdio support, so libstdc++ can include
it.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | scripts/build/cc/gcc.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_libs/340-picolibc.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 352f6518..35ac96e1 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -395,7 +395,9 @@ do_gcc_core_backend() { if [ "${CT_LIBC_PICOLIBC}" = "y" ]; then extra_config+=("--with-default-libc=picolibc") extra_config+=("--enable-stdio=pure") - extra_config+=("--disable-wchar_t") + if [ "${CT_PICOLIBC_older_than_1_8}" = "y" ]; then + extra_config+=("--disable-wchar_t") + fi fi core_LDFLAGS+=("${ldflags}") diff --git a/scripts/build/companion_libs/340-picolibc.sh b/scripts/build/companion_libs/340-picolibc.sh index 7b29a820..929babf0 100644 --- a/scripts/build/companion_libs/340-picolibc.sh +++ b/scripts/build/companion_libs/340-picolibc.sh @@ -146,7 +146,9 @@ do_cc_libstdcxx_picolibc() final_opts+=( "lang_list=c,c++" ) final_opts+=( "build_step=libstdcxx" ) final_opts+=( "extra_config+=('--enable-stdio=stdio_pure')" ) - final_opts+=( "extra_config+=('--disable-wchar_t')" ) + if [ "${CT_PICOLIBC_older_than_1_8}" = "y" ]; then + final_opts+=( "extra_config+=('--disable-wchar_t')" ) + fi if [ "${CT_LIBC_PICOLIBC_ENABLE_TARGET_OPTSPACE}" = "y" ]; then final_opts+=( "enable_optspace=yes" ) fi |