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
Replace #define with constexpr declarations.
[simgrid.git]
/
src
/
smpi
/
smpif90.in
diff --git
a/src/smpi/smpif90.in
b/src/smpi/smpif90.in
index
2100adb
..
aa51d8b
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-201
8
. The SimGrid Team. All rights reserved.
+# Copyright (c) 2012-201
9
. 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.
@@
-16,10
+16,12
@@
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
list_set FFLAGS @SMPI_Fortran_FLAGS@
@SMPITOOLS_SH@
list_set FFLAGS @SMPI_Fortran_FLAGS@
- if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
- list_add LINKARGS "-shared"
- fi
list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
+if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
+ list_add LINKARGS "-shared"
+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
list_set TMPFILES
main_name=main
@@
-31,8
+33,8
@@
trap 'cleanup' EXIT
filter_and_compile() {
list_add TMPFILES "${TMPFILE}"
filter_and_compile() {
list_add TMPFILES "${TMPFILE}"
- #replace "program main_name by subroutine user
\
_main (and the end clause as well)"
- sed 's/
[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /g' "${ARG}"
> "${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}"
list_add CMDLINE "${SRCFILE}"
}
SRCFILE="${TMPFILE}"
list_add CMDLINE "${SRCFILE}"
}