rename libs

Signed-off-by: Adrian Gielniewski <[email protected]>

Author: adigie

scripts/build/companion_libs/340-picolibc.sh

@@ -69,7 +69,6 @@ do_cc_libstdcxx_picolibc()
         CT_DoStep INFO "Installing libstdc++ picolibc"
         CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-libstdcxx-picolibc${suffix}"
         "${final_backend}" "${final_opts[@]}"
-        # TODO: suffix
         CT_Popd
 
         CT_EndStep
@@ -175,12 +174,13 @@ EOF
     CT_Popd
     CT_EndStep
 
-    do_cc_libstdcxx_picolibc
-
     if [ "${CT_LIBC_PICOLIBC_GCC_LIBSTDCXX_NOEXCEPT}" = "y" ]; then
       do_cc_libstdcxx_picolibc noexcept
+      CT_IterateMultilibs picolibc_rename_multilibs renamelibs variant=noexcept
     fi
 
+    do_cc_libstdcxx_picolibc
+
     if [ "${CT_STRIP_TARGET_TOOLCHAIN_LIBRARIES}" = "y" ]; then
 
 	CT_DoStep INFO "Stripping Picolibc library"
@@ -196,4 +196,24 @@ EOF
     fi
 }
 
+picolibc_rename_multilibs()
+{
+    local picolibc_lib_dir="${CT_PREFIX_DIR}/picolibc"
+    local multi_flags multi_dir multi_os_dir multi_os_dir_gcc multi_root multi_index multi_count variant
+
+    for arg in "$@"; do
+        eval "${arg// /\\ }"
+    done
+
+    CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/${CT_TARGET}/lib/${multi_dir}"
+
+    for lib_a in "${picolibc_lib_dir}/${CT_TARGET}/lib/${multi_dir}/"*.a; do
+       if [ -f ${lib_a} ] && [ ! -L ${lib_a} ]; then
+          _f=$(basename "${lib_a}")
+          CT_DoExecLog ALL mv "${lib_a}" \
+                              "${CT_PREFIX_DIR}/${CT_TARGET}/lib/${multi_dir}/${_f%.*}_${variant}.a"
+       fi
+    done
+}
+
 fi