ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 04:47:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue #449.

Browse Source 
After building final gcc, place the libraries in non-sysroot libs
into sysroot.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2016-10-02 15:23:53 -07:00
parent 531eab4c56
commit 75dee86653
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/build/cc/100-gcc.sh
View File

@ -769,6 +769,23 @@ do_gcc_for_build() {
CT_EndStep
}
gcc_movelibs() {
local multi_flags multi_dir multi_os_dir multi_root multi_index multi_count
local gcc_dir
for arg in "$@"; do
eval "${arg// /\\ }"
done
# Move only files, directories are for other multilibs
gcc_dir="${CT_PREFIX_DIR}/${CT_TARGET}/lib/${multi_dir}"
ls "${gcc_dir}" | while read f; do
if [ -f "${gcc_dir}/${f}" ]; then
CT_DoExecLog ALL mv "${gcc_dir}/${f}" "${multi_root}/lib/${multi_os_dir}/${f}"
fi
done
}
#------------------------------------------------------------------------------
# Build final gcc to run on host
do_gcc_for_host() {
@ -800,10 +817,18 @@ do_gcc_for_host() {
CT_DoStep INFO "Installing final gcc compiler"
CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-gcc-final"
"${final_backend}" "${final_opts[@]}"
CT_Popd
# GCC installs stuff (including libgcc) into its own /lib dir,
# outside of sysroot, breaking linking with -static-libgcc.
# Fix up by moving the libraries into the sysroot.
if [ "${CT_USE_SYSROOT}" = "y" ]; then
CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-gcc-final-movelibs"
CT_IterateMultilibs gcc_movelibs movelibs
CT_Popd
fi
CT_EndStep
}