summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2019-10-17 17:26:58 -0500
committerathenian200 <athenian200@outlook.com>2019-10-21 04:53:44 -0500
commit21146d0d5e4b6c985a3dce26460a5f495f1deb6e (patch)
treef33bb9b839f46d2e606a543239df38baedb66b5c
parent9cd92944e2c772fbb2e9856d5948553ae9233c9a (diff)
downloadUXP-21146d0d5e4b6c985a3dce26460a5f495f1deb6e.tar
UXP-21146d0d5e4b6c985a3dce26460a5f495f1deb6e.tar.gz
UXP-21146d0d5e4b6c985a3dce26460a5f495f1deb6e.tar.lz
UXP-21146d0d5e4b6c985a3dce26460a5f495f1deb6e.tar.xz
UXP-21146d0d5e4b6c985a3dce26460a5f495f1deb6e.zip
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.
-rw-r--r--js/src/old-configure.in8
-rw-r--r--old-configure.in8
2 files changed, 14 insertions, 2 deletions
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 45108ee59..6566ce05e 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -923,6 +923,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
diff --git a/old-configure.in b/old-configure.in
index 253084216..dae43d6f1 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1197,8 +1197,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