diff options
| author |   Alexey Neyman <stilor@att.net> | 2016-12-17 19:49:18 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2016-12-17 20:10:10 (GMT) |
| commit | b1ac2e7a7d18f167219012621983263579a3be96 (patch) | |
| tree | babba1f9813298b2c554ec967fa6375c180a3520 /scripts/build/cc | |
| parent | 53758f34ef50050a8e75ac87975816d7d328370f (diff) | |
Pass original multi_os_dir to iterator.
This is needed for callbacks that use that directory to look inside
GCC internal directories, e.g. moving the libraries. This broke
when I made libexpat for target honor ${CT_SHARED_LIBS}.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/cc')
| -rw-r--r-- | scripts/build/cc/100-gcc.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index b0b713d..164fb9b 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 |