commit: d245197378818f66c978d4427b6d0d81fbfaefc6 Author: Krzesimir Nowak <knowak <AT> microsoft <DOT> com> AuthorDate: Thu Nov 10 15:45:48 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 5 00:16:31 2023 +0000 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=d2451973
gcc-config: Use relative paths for liblto and cc symlink targets That way, for ROOT different than / (like /build/amd64-usr) these symlinks won't dangle after chrooting into ROOT. Bug: https://bugs.gentoo.org/880977 Signed-off-by: Krzesimir Nowak <knowak <AT> microsoft.com> Closes: https://github.com/gentoo/gcc-config/pull/2 Signed-off-by: Sam James <sam <AT> gentoo.org> gcc-config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc-config b/gcc-config index a44fced..f39dd5c 100755 --- a/gcc-config +++ b/gcc-config @@ -345,7 +345,7 @@ update_wrappers() { # But create our own ${CTARGET}-cc in /usr/bin to avoid fallbacks # to the symlinks LLVM creates (sys-devel/clang-toolchain-symlinks). # bug #872416. - atomic_ln "${EROOT}usr/bin/${CTARGET}-gcc" "${EROOT}usr/bin" "${CTARGET}-cc" + atomic_ln "${CTARGET}-gcc" "${EROOT}usr/bin" "${CTARGET}-cc" # handle the canonical cpp wrapper if ! is_cross_compiler ; then @@ -813,11 +813,12 @@ switch_profile() { # Update LTO plugin for GCC. Supported as of binutils 2.25. local BFD_PLUGINS_DIR local LIBLTO_PLUGIN - LIBLTO_PLUGIN="${EROOT}usr/libexec/gcc/${CTARGET}/${CC_COMP_VERSION}/liblto_plugin.so" if is_cross_compiler; then BFD_PLUGINS_DIR="${EROOT}usr/${CHOST}/${CTARGET}/binutils-bin/lib/bfd-plugins" + LIBLTO_PLUGIN="../../../../../libexec/gcc/${CTARGET}/${CC_COMP_VERSION}/liblto_plugin.so" else BFD_PLUGINS_DIR="${EROOT}usr/${CHOST}/binutils-bin/lib/bfd-plugins" + LIBLTO_PLUGIN="../../../../libexec/gcc/${CTARGET}/${CC_COMP_VERSION}/liblto_plugin.so" fi mkdir -p "${BFD_PLUGINS_DIR}" ln -sf "${LIBLTO_PLUGIN}" "${BFD_PLUGINS_DIR}"
