diff options
Diffstat (limited to 'scripts/build')
| -rw-r--r-- | scripts/build/cc/100-gcc.sh | 5 | ||||
| -rw-r--r-- | scripts/build/companion_libs/330-gettext.sh | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index b0b713db..164fb9ba 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -787,8 +787,9 @@ gcc_movelibs() { eval "${arg// /\\ }" done - # Move only files, directories are for other multilibs - gcc_dir="${CT_PREFIX_DIR}/${CT_TARGET}/lib/${multi_os_dir}" + # Move only files, directories are for other multilibs. We're looking inside + # GCC's directory structure, thus use unmangled multi_os_dir that GCC reports. + gcc_dir="${CT_PREFIX_DIR}/${CT_TARGET}/lib/${multi_os_dir_gcc}" if [ ! -d "${gcc_dir}" ]; then # GCC didn't install anything outside of sysroot return diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh index 0a076780..07ea02b8 100644 --- a/scripts/build/companion_libs/330-gettext.sh +++ b/scripts/build/companion_libs/330-gettext.sh @@ -118,6 +118,14 @@ do_gettext_backend() { --disable-csharp \ --without-emacs \ --disable-openmp \ + --with-included-libxml \ + --with-included-gettext \ + --with-included-glib \ + --with-included-libcroco \ + --with-included-libunistring \ + --with-libncurses-prefix="${prefix}" \ + --with-libiconv-prefix="${prefix}" \ + --without-libpth-prefix \ "${extra_config[@]}" CT_DoLog EXTRA "Building gettext" |