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