env: Use LDFLAGS without MPICHLIB_LDFLAGS in wrapper scripts

MPICHLIB_LDFLAGS should only be used to build the MPICH library.

configure.ac

@@ -311,6 +311,10 @@ CPPFLAGS="$CPPFLAGS $MPICHLIB_CPPFLAGS"
 CXXFLAGS="$CXXFLAGS $MPICHLIB_CXXFLAGS"
 FFLAGS="$FFLAGS $MPICHLIB_FFLAGS"
 FCFLAGS="$FCFLAGS $MPICHLIB_FCFLAGS"
+# Save LDFLAGS before merging with MPICHLIB_LDFLAGS. The wrapper scripts
+# may need this in case interlibrary dependencies are not supported.
+SAVE_LDFLAGS=$LDFLAGS
+AC_SUBST(SAVE_LDFLAGS)
 LDFLAGS="$LDFLAGS $MPICHLIB_LDFLAGS"
 LIBS="$LIBS $MPICHLIB_LIBS"
 

src/env/mpicc.bash.in

@@ -262,7 +262,7 @@ final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICC_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_ldflags="${final_ldflags} @SAVE_LDFLAGS@"
     final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
 fi
 

src/env/mpicc.sh.in

@@ -268,7 +268,7 @@ final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICC_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_ldflags="${final_ldflags} @SAVE_LDFLAGS@"
     final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
 fi
 

src/env/mpicxx.bash.in

@@ -267,7 +267,7 @@ final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICXX_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_ldflags="${final_ldflags} @SAVE_LDFLAGS@"
     final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
 fi
 

src/env/mpicxx.sh.in

@@ -273,7 +273,7 @@ final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
 final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICXX_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_ldflags="${final_ldflags} @SAVE_LDFLAGS@"
     final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
 fi
 

src/env/mpifort.bash.in

@@ -339,7 +339,7 @@ final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
 final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPIFORT_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_ldflags="${final_ldflags} @SAVE_LDFLAGS@"
     final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
 fi
 

src/env/mpifort.sh.in

@@ -356,7 +356,7 @@ final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
 final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPIFORT_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_ldflags="${final_ldflags} @SAVE_LDFLAGS@"
     final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
 fi