summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2016-11-08 00:38:02 (GMT)
committerGitHub <noreply@github.com>2016-11-08 00:38:02 (GMT)
commit23e9a03a3f4a5eaded6cadbe4d808997879450d1 (patch)
tree280cebcd23a2ea54c9c478652ace7fead592ba44 /scripts
parentdf5a341e592fe162999ed9be6da3fb67eb885f12 (diff)
parent91575d02c47e384e381a8a9c83e33814d26799b3 (diff)
Merge pull request #461 from stilor/static-libgcc-more-fixes
Making libmpx configurable & moving gcc libs: more fixes
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/cc/100-gcc.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index 14edcd4..bab4c7b 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -780,8 +780,20 @@ gcc_movelibs() {
# Move only files, directories are for other multilibs
gcc_dir="${CT_PREFIX_DIR}/${CT_TARGET}/lib/${multi_os_dir}"
+ if [ ! -d "${gcc_dir}" ]; then
+ # GCC didn't install anything outside of sysroot
+ return
+ fi
ls "${gcc_dir}" | while read f; do
+ case "${f}" in
+ *.ld)
+ # Linker scripts remain in GCC's directory; elf2flt insists on
+ # finding them there.
+ continue
+ ;;
+ esac
if [ -f "${gcc_dir}/${f}" ]; then
+ CT_DoExecLog ALL mkdir -p "${multi_root}/lib/${multi_os_dir}"
CT_DoExecLog ALL mv "${gcc_dir}/${f}" "${multi_root}/lib/${multi_os_dir}/${f}"
fi
done