From f75e891b747ef0b85ab1f296098751cda4ab4e33 Mon Sep 17 00:00:00 2001
From: Jeff Kaufman <jeff@jefftk.com>
Date: Thu, 15 Sep 2016 15:18:49 -0400
Subject: [PATCH] We need -lstdc++ to come after psol.a (#1273)

---
 config | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config b/config
index e98e73e34..473b7a78c 100644
--- a/config
+++ b/config
@@ -80,10 +80,8 @@ ps_maybe_gpp_base=`basename $CC| sed s/gcc/g++/`
 ps_maybe_gpp="`dirname $CC`/$ps_maybe_gpp_base"
 if [ -n "$NGX_GCC_VER" -a \( -x "$ps_maybe_gpp" \) ]; then
   LINK=$ps_maybe_gpp
-  NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT -lstdc++"
-else
-  pagespeed_libs="-lstdc++"
 fi
+pagespeed_libs="-lstdc++"
 
 # The compiler needs to know that __sync_add_and_fetch_4 is ok,
 # and this requires an instruction that didn't exist on i586 or i386.
@@ -170,7 +168,7 @@ pagespeed_include="\
   $mod_pagespeed_dir/url"
 ngx_feature_path="$pagespeed_include"
 
-pagespeed_libs="$pagespeed_libs $psol_binary -lrt -pthread -lm"
+pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm"
 ngx_feature_libs="$pagespeed_libs"
 ngx_feature_test="