[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-6-ge1635ed

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  e1635ed2e0bc0fc7ceaa5130b0977dec59d7ec04 (commit)
      from  f6ef4406135f1e8a32cb529a3c3e6f69e514c415 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/e1635ed2e0bc0fc7ceaa5130b0977dec59d7ec04

commit e1635ed2e0bc0fc7ceaa5130b0977dec59d7ec04
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Tue Jun 2 23:21:52 2015 -0500

    bug fix and add @WRAPPER_LDFLAGS@ to final_ldflags
    
    Some special options might be added by libtool, such as -Wl,-flat_namespace -Wl,-commons,use_dylibs,
    and we do not want to drop them even when interlibrary deps is on.
    
    Also reference [eb0e7712]
    
    Fixes #2271
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in
index a817989..994fdc1 100644
--- a/src/env/mpicc.bash.in
+++ b/src/env/mpicc.bash.in
@@ -210,11 +210,11 @@ fi
 
 final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
 final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
-final_ldflags="@MPICH_MPICC_LDFLAGS@"
+final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICC_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # -----------------------------------------------------------------------
diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in
index 7b88647..8c8cfc0 100644
--- a/src/env/mpicc.sh.in
+++ b/src/env/mpicc.sh.in
@@ -219,11 +219,11 @@ fi
 
 final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
 final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
-final_ldflags="@MPICH_MPICC_LDFLAGS@"
+final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICC_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # -----------------------------------------------------------------------
diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in
index 865fc7f..b671f77 100644
--- a/src/env/mpicxx.bash.in
+++ b/src/env/mpicxx.bash.in
@@ -216,11 +216,11 @@ fi
 
 final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
 final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
-final_ldflags="@MPICH_MPICXX_LDFLAGS@"
+final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICXX_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # A temporary statement to invoke the compiler
diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in
index d3dff0f..cf63bda 100644
--- a/src/env/mpicxx.sh.in
+++ b/src/env/mpicxx.sh.in
@@ -225,11 +225,11 @@ fi
 
 final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
 final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
-final_ldflags="@MPICH_MPICXX_LDFLAGS@"
+final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPICXX_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # A temporary statement to invoke the compiler
diff --git a/src/env/mpif77.bash.in b/src/env/mpif77.bash.in
index d3a9e95..de6d1f5 100644
--- a/src/env/mpif77.bash.in
+++ b/src/env/mpif77.bash.in
@@ -267,11 +267,11 @@ if [ -n "$profConf" ] ; then
 fi
 
 final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@"
-final_ldflags="@MPICH_MPIF77_LDFLAGS@"
+final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPIF77_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # A temporary statement to invoke the compiler
diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in
index 7e347bc..4710512 100644
--- a/src/env/mpif77.sh.in
+++ b/src/env/mpif77.sh.in
@@ -289,11 +289,11 @@ if [ -n "$profConf" ] ; then
 fi
 
 final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@"
-final_ldflags="@MPICH_MPIF77_LDFLAGS@"
+final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPIF77_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # A temporary statement to invoke the compiler
diff --git a/src/env/mpifort.bash.in b/src/env/mpifort.bash.in
index af006ee..a3ad54d 100644
--- a/src/env/mpifort.bash.in
+++ b/src/env/mpifort.bash.in
@@ -308,11 +308,11 @@ elif [ -n "$FCMODINC" ] ; then
 fi
 
 final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
-final_ldflags="@MPICH_MPIFORT_LDFLAGS@"
+final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPIFORT_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # A temporary statement to invoke the compiler
diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in
index 0cf8e8e..96aba33 100644
--- a/src/env/mpifort.sh.in
+++ b/src/env/mpifort.sh.in
@@ -325,11 +325,11 @@ elif [ -n "$FCMODINC" ] ; then
 fi
 
 final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
-final_ldflags="@MPICH_MPIFORT_LDFLAGS@"
+final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
 final_libs="@MPICH_MPIFORT_LIBS@"
 if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="$ldflags @LDFLAGS@ @WRAPPER_LDFLAGS@"
-    final_libs="$libs @LIBS@ @WRAPPER_LIBS@"
+    final_ldflags="${final_ldflags} @LDFLAGS@"
+    final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
 fi
 
 # A temporary statement to invoke the compiler

-----------------------------------------------------------------------

Summary of changes:
 src/env/mpicc.bash.in   |    6 +++---
 src/env/mpicc.sh.in     |    6 +++---
 src/env/mpicxx.bash.in  |    6 +++---
 src/env/mpicxx.sh.in    |    6 +++---
 src/env/mpif77.bash.in  |    6 +++---
 src/env/mpif77.sh.in    |    6 +++---
 src/env/mpifort.bash.in |    6 +++---
 src/env/mpifort.sh.in   |    6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
MPICH primary repository