MoonchildProductions#1251 - Part 25: Fix link paths.

This fix is a bit ugly and may need to be changed later if we switch a new GCC version, but the fact is that we use an architecture-specific path for GCC libraries on Solaris, so knowing the right prefix for GCC would only help so much, because it would still need to decide between ${gccdir}/lib and ${gccdir}/lib/amd64. The MOZ_FIX_LINK_PATHS variable puts the search paths into the right order without the need for me to use elfedit on the binaries afterwards.
This commit is contained in:
athenian200 2019-10-17 17:26:58 -05:00 committed by Roy Tam
commit e27eeb28c6
2 changed files with 14 additions and 2 deletions

View file

@ -933,6 +933,14 @@ case "$target" in
fi
;;
i*86-*-solaris*)
MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib"
;;
x86_64-*-solaris*)
MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib/amd64"
;;
esac
dnl Only one oddball right now (QNX), but this gives us flexibility

View file

@ -1206,8 +1206,12 @@ case "$target" in
fi
;;
*-solaris*)
MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
i*86-*-solaris*)
MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib"
;;
x86_64-*-solaris*)
MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib/amd64"
;;
esac