146 lines
5.4 KiB
Diff
146 lines
5.4 KiB
Diff
From e4f0e86f815d8bd3dbb7cccf660bae6ab7f302dd Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Sun, 10 Apr 2022 09:35:14 +0200
|
|
Subject: [PATCH 3/4] Drop build flags, e.g. -specs... and -lto from mpi
|
|
wrappers (mpicc and mpicxx)
|
|
|
|
For discussion see:
|
|
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/7TFWEKTDWBYBHEGMIWBVI3AVGORZGNBS/
|
|
---
|
|
src/env/mpicc.bash.in | 8 ++++----
|
|
src/env/mpicc.sh.in | 8 ++++----
|
|
src/env/mpicxx.bash.in | 8 ++++----
|
|
src/env/mpicxx.sh.in | 8 ++++----
|
|
src/env/mpifort.bash.in | 6 +++---
|
|
src/env/mpifort.sh.in | 6 +++---
|
|
6 files changed, 22 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in
|
|
index 56d2dcb242..933ee22bf0 100644
|
|
--- a/src/env/mpicc.bash.in
|
|
+++ b/src/env/mpicc.bash.in
|
|
@@ -247,13 +247,13 @@ if [ -n "$profConf" ] ; then
|
|
fi
|
|
fi
|
|
|
|
-final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
|
|
-final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
|
-final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
|
+final_cflags="@MPICH_MPICC_CFLAGS@ "
|
|
+final_cppflags="@MPICH_MPICC_CPPFLAGS@ "
|
|
+final_ldflags="@MPICH_MPICC_LDFLAGS@ "
|
|
final_libs="@MPICH_MPICC_LIBS@"
|
|
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
|
final_ldflags="${final_ldflags} @LDFLAGS@"
|
|
- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
|
|
+ final_libs="${final_libs} @LIBS@ "
|
|
fi
|
|
|
|
# -----------------------------------------------------------------------
|
|
diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in
|
|
index 654131528e..4ebdc8b6ef 100644
|
|
--- a/src/env/mpicc.sh.in
|
|
+++ b/src/env/mpicc.sh.in
|
|
@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then
|
|
fi
|
|
fi
|
|
|
|
-final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
|
|
-final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
|
-final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
|
+final_cflags="@MPICH_MPICC_CFLAGS@ "
|
|
+final_cppflags="@MPICH_MPICC_CPPFLAGS@ "
|
|
+final_ldflags="@MPICH_MPICC_LDFLAGS@ "
|
|
final_libs="@MPICH_MPICC_LIBS@"
|
|
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
|
final_ldflags="${final_ldflags} @LDFLAGS@"
|
|
- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
|
|
+ final_libs="${final_libs} @LIBS@ "
|
|
fi
|
|
|
|
# -----------------------------------------------------------------------
|
|
diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in
|
|
index 10d11e3fba..4066bb46f2 100644
|
|
--- a/src/env/mpicxx.bash.in
|
|
+++ b/src/env/mpicxx.bash.in
|
|
@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then
|
|
fi
|
|
fi
|
|
|
|
-final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
|
|
-final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
|
-final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
|
+final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ "
|
|
+final_cppflags="@MPICH_MPICXX_CPPFLAGS@ "
|
|
+final_ldflags="@MPICH_MPICXX_LDFLAGS@ "
|
|
final_libs="@MPICH_MPICXX_LIBS@"
|
|
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
|
final_ldflags="${final_ldflags} @LDFLAGS@"
|
|
- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
|
|
+ final_libs="${final_libs} @LIBS@ "
|
|
fi
|
|
|
|
# A temporary statement to invoke the compiler
|
|
diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in
|
|
index 1c0078100f..2c090cb06c 100644
|
|
--- a/src/env/mpicxx.sh.in
|
|
+++ b/src/env/mpicxx.sh.in
|
|
@@ -259,13 +259,13 @@ if [ -n "$profConf" ] ; then
|
|
fi
|
|
fi
|
|
|
|
-final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
|
|
-final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
|
-final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
|
+final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ "
|
|
+final_cppflags="@MPICH_MPICXX_CPPFLAGS@ "
|
|
+final_ldflags="@MPICH_MPICXX_LDFLAGS@ "
|
|
final_libs="@MPICH_MPICXX_LIBS@"
|
|
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
|
final_ldflags="${final_ldflags} @LDFLAGS@"
|
|
- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
|
|
+ final_libs="${final_libs} @LIBS@ "
|
|
fi
|
|
|
|
# A temporary statement to invoke the compiler
|
|
diff --git a/src/env/mpifort.bash.in b/src/env/mpifort.bash.in
|
|
index 1130c57986..91a6cb56c5 100644
|
|
--- a/src/env/mpifort.bash.in
|
|
+++ b/src/env/mpifort.bash.in
|
|
@@ -335,12 +335,12 @@ elif [ -n "$FCMODINC" ] ; then
|
|
FCMODDIRS="${FCMODINC}$modincdir"
|
|
fi
|
|
|
|
-final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
|
|
-final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
|
+final_fcflags="@MPICH_MPIFORT_FCFLAGS@ "
|
|
+final_ldflags="@MPICH_MPIFORT_LDFLAGS@ "
|
|
final_libs="@MPICH_MPIFORT_LIBS@"
|
|
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
|
final_ldflags="${final_ldflags} @LDFLAGS@"
|
|
- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
|
|
+ final_libs="${final_libs} @LIBS@ "
|
|
fi
|
|
|
|
# A temporary statement to invoke the compiler
|
|
diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in
|
|
index a1e7f4dd8e..9d89a8bbe7 100644
|
|
--- a/src/env/mpifort.sh.in
|
|
+++ b/src/env/mpifort.sh.in
|
|
@@ -352,12 +352,12 @@ elif [ -n "$FCMODINC" ] ; then
|
|
FCMODDIRS="${FCMODINC}$modincdir"
|
|
fi
|
|
|
|
-final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
|
|
-final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
|
+final_fcflags="@MPICH_MPIFORT_FCFLAGS@ "
|
|
+final_ldflags="@MPICH_MPIFORT_LDFLAGS@ "
|
|
final_libs="@MPICH_MPIFORT_LIBS@"
|
|
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
|
final_ldflags="${final_ldflags} @LDFLAGS@"
|
|
- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@"
|
|
+ final_libs="${final_libs} @LIBS@ "
|
|
fi
|
|
|
|
# A temporary statement to invoke the compiler
|