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
Use 'std::vector' instead of a C-style array.
[simgrid.git]
/
src
/
smpi
/
smpif90.in
diff --git
a/src/smpi/smpif90.in
b/src/smpi/smpif90.in
index
61494c3
..
ca8eda5
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-202
0
. The SimGrid Team. All rights reserved.
+# Copyright (c) 2012-202
1
. 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.
@@
-18,12
+18,18
@@
CMAKE_LINKARGS="-L@libdir@"
list_set FFLAGS @SMPI_Fortran_FLAGS@
list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
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" "-Wl,-z,defs"
+ 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
list_set TMPFILES
else
echo "Warning: smpif90 pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
list_set TMPFILES
-main_name=main
cleanup () {
eval $(list_get TMPFILES)
cleanup () {
eval $(list_get TMPFILES)
@@
-34,8
+40,12
@@
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}"
}
list_add CMDLINE "${SRCFILE}"
}
@@
-53,13
+63,13
@@
while [ $# -gt 0 ]; do
list_add CMDLINE "-c"
;;
*.f90)
list_add CMDLINE "-c"
;;
*.f90)
- FILENAME=
`basename ${ARG}`
+ FILENAME=
$(basename "${ARG}")
TMPFILE=$(mymktemp "${ARG}" ".f90")
ORIGFILE="${FILENAME%.f90}"
filter_and_compile
;;
*.F90)
TMPFILE=$(mymktemp "${ARG}" ".f90")
ORIGFILE="${FILENAME%.f90}"
filter_and_compile
;;
*.F90)
- FILENAME=
`basename ${ARG}`
+ FILENAME=
$(basename "${ARG}")
TMPFILE=$(mymktemp "${ARG}" ".F90")
ORIGFILE="${FILENAME%.F90}"
filter_and_compile
TMPFILE=$(mymktemp "${ARG}" ".F90")
ORIGFILE="${FILENAME%.F90}"
filter_and_compile
@@
-95,11
+105,11
@@
if [ $NEEDS_OUTPUT -ne 0 ]; then
fi
list_add_not_empty CMDLINE ${INCLUDEARGS}
fi
list_add_not_empty CMDLINE ${INCLUDEARGS}
-list_add_not_empty CMDLINE
${CMAKE_LINKARGS}
+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)
-if [ "x$VERBOSE" = x1
-o
"x$show" = x1 ] ; then
+if [ "x$VERBOSE" = x1
] || [
"x$show" = x1 ] ; then
echo "$@"
[ "x$show" = x1 ] && exit 0
fi
echo "$@"
[ "x$show" = x1 ] && exit 0
fi