From 7e5ff857eefd66008c78f2bcda62b28316e71f09 Mon Sep 17 00:00:00 2001
From: athenian200 <athenian200@outlook.com>
Date: Wed, 2 Oct 2019 20:36:49 -0500
Subject: MoonchildProductions#1251 - Part 18: (Hopefully) final version of
 build system fixes.

I hope I can just apply these nice, clean changes and have everything work without having to make a mess again.
---
 old-configure.in | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'old-configure.in')

diff --git a/old-configure.in b/old-configure.in
index 1525ecc9b6..f8fb9245b1 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1197,6 +1197,10 @@ case "$target" in
     fi
     ;;
 
+*-solaris*
+    MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
+    ;;
+
 esac
 
 AC_SUBST_LIST(MMX_FLAGS)
-- 
cgit v1.2.3


From 575f51a27d6b3627ae5675cc8e920c8dcae073bd Mon Sep 17 00:00:00 2001
From: athenian200 <athenian200@outlook.com>
Date: Fri, 4 Oct 2019 04:37:51 -0500
Subject: Fix a bunch of dumb typos and omissions.

---
 old-configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'old-configure.in')

diff --git a/old-configure.in b/old-configure.in
index f8fb9245b1..c5b4f1efba 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1197,7 +1197,7 @@ case "$target" in
     fi
     ;;
 
-*-solaris*
+*-solaris*)
     MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
     ;;
 
-- 
cgit v1.2.3


From 9cd92944e2c772fbb2e9856d5948553ae9233c9a Mon Sep 17 00:00:00 2001
From: athenian200 <athenian200@outlook.com>
Date: Fri, 11 Oct 2019 15:36:33 -0500
Subject: MoonchildProductions#1251 - Part 24: Remove temporary GNU M4
 workaround.

We finally found where configure was failing. Apparently they just invoked m4 without regard for TOOLCHAIN_PREFIX. Easy to fix, difficult to find.
---
 old-configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'old-configure.in')

diff --git a/old-configure.in b/old-configure.in
index c5b4f1efba..2530842168 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -761,7 +761,7 @@ case "$host" in
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
     ;;
-
+ 
 *)
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
@@ -4146,7 +4146,7 @@ if test -f "${srcdir}/${MOZ_BUILD_APP}/configure.in" ; then
     _subconfigure_config_args="$ac_configure_args"
   }
   tmpscript=`$PYTHON -c 'import os, tempfile; print tempfile.mktemp(prefix="subscript.").replace(os.sep, "/")'` || exit 1
-  m4 "${srcdir}/build/autoconf/subconfigure.m4" \
+  ${TOOLCHAIN_PREFIX}m4 "${srcdir}/build/autoconf/subconfigure.m4" \
      "${srcdir}/build/autoconf/altoptions.m4" \
      "${srcdir}/${MOZ_BUILD_APP}/configure.in" > $tmpscript
   . $tmpscript
-- 
cgit v1.2.3


From 21146d0d5e4b6c985a3dce26460a5f495f1deb6e Mon Sep 17 00:00:00 2001
From: athenian200 <athenian200@outlook.com>
Date: Thu, 17 Oct 2019 17:26:58 -0500
Subject: 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.
---
 old-configure.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'old-configure.in')

diff --git a/old-configure.in b/old-configure.in
index 2530842168..dae43d6f1d 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
-- 
cgit v1.2.3