diff options
Diffstat (limited to 'scripts/build')
| -rw-r--r-- | scripts/build/companion_libs/340-picolibc.sh | 1 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scripts/build/companion_libs/340-picolibc.sh b/scripts/build/companion_libs/340-picolibc.sh index 525497a..cb96e71 100644 --- a/scripts/build/companion_libs/340-picolibc.sh +++ b/scripts/build/companion_libs/340-picolibc.sh @@ -40,6 +40,7 @@ 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_LIBC_PICOLIBC_ENABLE_TARGET_OPTSPACE}" = "y" ]; then final_opts+=( "enable_optspace=yes" ) fi diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index e6eec2a..75c683d 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -230,10 +230,16 @@ do_gdb_backend() if [ "${static}" = "y" ]; then cflags+=" -static" ldflags+=" -static" + # There is no static libsource-highlight + extra_config+=("--disable-source-highlight") fi if [ "${static_libstdcxx}" = "y" ]; then ldflags+=" -static-libgcc" ldflags+=" -static-libstdc++" + # libsource-highlight is a dynamic library that uses exception + # exceptions are handled by libstdc++ + # this combination is very buggy, so configure don't use it and abort + extra_config+=("--disable-source-highlight") fi |