A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prefer using initialization lists in ctors.
[simgrid.git]
/
src
/
smpi
/
smpif90.in
diff --git
a/src/smpi/smpif90.in
b/src/smpi/smpif90.in
index 68928b5faf036ef0e3ea0b529ea0cc72a56635a0..d89ff5e7f9406840a3f51840ccee312c6d6c789c 100644
(file)
--- a/
src/smpi/smpif90.in
+++ b/
src/smpi/smpif90.in
@@
-1,6
+1,6
@@
#!/usr/bin/env sh
#!/usr/bin/env sh
-# Copyright (c) 2012-20
19
. The SimGrid Team. All rights reserved.
+# Copyright (c) 2012-20
20
. The SimGrid Team. All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the license (GNU LGPL) which comes with this package.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the license (GNU LGPL) which comes with this package.
@@
-19,6
+19,13
@@
list_set FFLAGS @SMPI_Fortran_FLAGS@
list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
+ if [ "x${SMPI_NO_UNDEFINED_CHECK}" = "x" ]; then
+ if [ "x@APPLE@" != "x1" ]; then
+ list_add LINKARGS "-Wl,-z,defs"
+ else
+ list_add LINKARGS "-Wl,-undefined,error"
+ fi
+ fi
else
echo "Warning: smpif90 pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
else
echo "Warning: smpif90 pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
@@
-34,16
+41,17
@@
trap 'cleanup' EXIT
filter_and_compile() {
list_add TMPFILES "${TMPFILE}"
#replace "program main_name by subroutine user_main (and the end clause as well)"
filter_and_compile() {
list_add TMPFILES "${TMPFILE}"
#replace "program main_name by subroutine user_main (and the end clause as well)"
- sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
- SRCFILE="${TMPFILE}"
+ if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
+ sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
+ SRCFILE="${TMPFILE}"
+ else
+ SRCFILE="${ARG}"
+ fi
list_add CMDLINE "${SRCFILE}"
}
NEEDS_OUTPUT=1
list_add CMDLINE "${SRCFILE}"
}
NEEDS_OUTPUT=1
-# By default, we execute the commands instead of only showing them to cmake
-Show=
-
list_set CMDLINE "${REAL_FORTRAN_COMPILER}"
list_add_not_empty CMDLINE "${FFLAGS}"
while [ $# -gt 0 ]; do
list_set CMDLINE "${REAL_FORTRAN_COMPILER}"
list_add_not_empty CMDLINE "${FFLAGS}"
while [ $# -gt 0 ]; do
@@
-85,7
+93,7
@@
while [ $# -gt 0 ]; do
;;
'-show'|'-compile-info'|'-link-info')
# Dry run displaying commands instead of executing them. Useful to cmake
;;
'-show'|'-compile-info'|'-link-info')
# Dry run displaying commands instead of executing them. Useful to cmake
- Show=echo
+ show=1
;;
*)
list_add CMDLINE "${ARG}"
;;
*)
list_add CMDLINE "${ARG}"
@@
-102,4
+110,8
@@
list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
list_add_not_empty CMDLINE "${LINKARGS}"
eval $(list_get CMDLINE)
list_add_not_empty CMDLINE "${LINKARGS}"
eval $(list_get CMDLINE)
-$Show "$@"
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+ echo "$@"
+ [ "x$show" = x1 ] && exit 0
+fi
+"$@"