Lines 312-317
Link Here
|
312 |
multilibdir=${multilib%;*} |
312 |
multilibdir=${multilib%;*} |
313 |
libdir="lib/"$("${ROOT}/${GCC_BIN_PATH}"/gcc ${multiarg} -print-multi-os-directory) |
313 |
libdir="lib/"$("${ROOT}/${GCC_BIN_PATH}"/gcc ${multiarg} -print-multi-os-directory) |
314 |
if mkdir -p "${ROOT}/${libdir}"/.gcc.config.new ; then |
314 |
if mkdir -p "${ROOT}/${libdir}"/.gcc.config.new ; then |
|
|
315 |
# When changing the base libgcc_s.so.1, we must make sure that the new one |
316 |
# is available during mv execution, or it fails if it's the first run of |
317 |
# gcc-config (e.g.: on catalyst) |
318 |
save_library_path="${LD_LIBRARY_PATH}" |
319 |
if [[ ${ROOT} == "/" ]]; then |
320 |
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/${libdir}/.gcc.config.new" |
321 |
fi |
315 |
for gcclib in gcc_s unwind ; do |
322 |
for gcclib in gcc_s unwind ; do |
316 |
if [[ -n $(ls "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* 2>/dev/null) ]]; then |
323 |
if [[ -n $(ls "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* 2>/dev/null) ]]; then |
317 |
${CP} -pP "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* "${ROOT}/${libdir}"/.gcc.config.new/ |
324 |
${CP} -pP "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* "${ROOT}/${libdir}"/.gcc.config.new/ |
Lines 319-324
Link Here
|
319 |
${MV} -f "${ROOT}/${libdir}"/.gcc.config.new/* "${ROOT}/${libdir}"/ |
326 |
${MV} -f "${ROOT}/${libdir}"/.gcc.config.new/* "${ROOT}/${libdir}"/ |
320 |
fi |
327 |
fi |
321 |
done |
328 |
done |
|
|
329 |
export LD_LIBRARY_PATH="${save_library_path}" |
322 |
rmdir "${ROOT}/${libdir}"/.gcc.config.new |
330 |
rmdir "${ROOT}/${libdir}"/.gcc.config.new |
323 |
fi |
331 |
fi |
324 |
done |
332 |
done |