From d83a003618ac85d27f19d8fcb6c901f024d3e296 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Tue, 28 Mar 2017 23:38:55 -0700
Subject: [PATCH] Add symlinks from the libraries' original location to the new
 one.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/build/cc/100-gcc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index f7c1a9cb..190aec88 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -759,6 +759,7 @@ do_gcc_for_build() {
 gcc_movelibs() {
     local multi_flags multi_dir multi_os_dir multi_os_dir_gcc multi_root multi_index multi_count
     local gcc_dir dst_dir
+    local rel
 
     for arg in "$@"; do
         eval "${arg// /\\ }"
@@ -779,6 +780,7 @@ gcc_movelibs() {
         dst_dir="${multi_root}/lib/${multi_os_dir}"
     fi
     CT_SanitizeVarDir dst_dir gcc_dir
+    rel=$( echo "${gcc_dir#${CT_PREFIX_DIR}/}" | sed 's#[^/]\{1,\}#..#g' )
 
     ls "${gcc_dir}" | while read f; do
         case "${f}" in
@@ -791,6 +793,7 @@ gcc_movelibs() {
         if [ -f "${gcc_dir}/${f}" ]; then
             CT_DoExecLog ALL mkdir -p "${dst_dir}"
             CT_DoExecLog ALL mv "${gcc_dir}/${f}" "${dst_dir}/${f}"
+            CT_DoExecLog ALL ln -sf "${rel}/${dst_dir#${CT_PREFIX_DIR}/}/${f}" "${gcc_dir}/${f}"
         fi
     done
 }