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
reduce the verbosity of that message
[simgrid.git]
/
src
/
smpi
/
smpif90.in
diff --git
a/src/smpi/smpif90.in
b/src/smpi/smpif90.in
index
231a4b7
..
459cac3
100644
(file)
--- a/
src/smpi/smpif90.in
+++ b/
src/smpi/smpif90.in
@@
-1,6
+1,6
@@
#! /bin/sh
#! /bin/sh
-# Copyright (c) 2012-201
5
. The SimGrid Team.
+# Copyright (c) 2012-201
7
. The SimGrid Team.
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
@@
-9,15
+9,15
@@
SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
SIMGRID_GITHASH="@SIMGRID_GITHASH@"
SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
SIMGRID_GITHASH="@SIMGRID_GITHASH@"
-F90=@
GFORTRAN_EXE
@
+F90=@
SAVED_Fortran_COMPILER
@
INCLUDEARGS="@includeflag@"
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
INCLUDEARGS="@includeflag@"
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
-list_set FFLAGS "-ff2c" "-fno-second-underscore"
-list_set LINKARGS "-lsimgrid" "-lm" "-lgfortran"
+list_set FFLAGS "-f
pic" "-f
f2c" "-fno-second-underscore"
+list_set LINKARGS "-
shared" "-
lsimgrid" "-lm" "-lgfortran"
list_set TMPFILES
main_name=main
list_set TMPFILES
main_name=main
@@
-30,7
+30,7
@@
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:]]*
program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI
' "${ARG}" > "${TMPFILE}"
+ sed 's/[[:space:]]*
[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\" /g
' "${ARG}" > "${TMPFILE}"
SRCFILE="${TMPFILE}"
list_add CMDLINE "${SRCFILE}"
}
SRCFILE="${TMPFILE}"
list_add CMDLINE "${SRCFILE}"
}
@@
-65,6
+65,10
@@
while [ $# -gt 0 ]; do
'-compiler-version' | '--compiler-version')
${F90} --version
;;
'-compiler-version' | '--compiler-version')
${F90} --version
;;
+ -o)
+ list_add CMDLINE "-o$1"
+ shift
+ ;;
*)
list_add CMDLINE "${ARG}"
;;
*)
list_add CMDLINE "${ARG}"
;;