From e27eeb28c6aca2a303ef7dcd83ce2adbe861e932 Mon Sep 17 00:00:00 2001
From: athenian200 <athenian200@outlook.com>
Date: Thu, 17 Oct 2019 17:26:58 -0500
Subject: [PATCH] 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.
---
 js/src/old-configure.in | 8 ++++++++
 old-configure.in        | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 7e29f19fc9..affd0eac8e 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -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
diff --git a/old-configure.in b/old-configure.in
index 4708ffdb9d..0af1e9d507 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -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