X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18ea25fb70634e1cc6d53f080cccaf838bb9db61..aa3595ed3c903167f52eeeab8e636bec96b258dd:/src/smpi/smpiff.in

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 8b63bee120..c63b5240fb 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -9,14 +9,14 @@
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
-F77=@GFORTRAN_EXE@
+F77=@SAVED_Fortran_COMPILER@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
 
 @SMPITOOLS_SH@
 
-list_set FFLAGS "-ff2c" "-fno-second-underscore" "-ffixed-line-length-none" "-cpp"
+list_set FFLAGS "-ff2c" "-fno-second-underscore"
 list_set LINKARGS "-lsimgrid" "-lm" "-lgfortran"
 list_set TMPFILES
 main_name=main
@@ -30,12 +30,15 @@ trap 'cleanup' EXIT
 filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
     #replace "program main_name by subroutine user\_main (and the end clause as well)"
-    echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
+    if [ $TRACE_CALL_LOCATION -gt 0 ]; then
+      echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
     echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
-    sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" >> "${TMPFILE}"
+    fi
+    sed 's/[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\" /g' "${ARG}" >> "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
+TRACE_CALL_LOCATION=0
 NEEDS_OUTPUT=1
 
 list_set CMDLINE "${F77}"
@@ -70,6 +73,12 @@ while [ $# -gt 0 ]; do
         '-compiler-version' | '--compiler-version')
             ${F77} --version
             ;;
+        '-trace-call-location')
+            TRACE_CALL_LOCATION=1
+            # This should be list_add FFLAGS but it's not possible
+            # anymore: FFLAGS was already moved into CMDLINE above.
+            list_add_not_empty CMDLINE "-ffixed-line-length-none" "-cpp"
+            ;;
         -o)
             NEEDS_OUTPUT=0
             list_add CMDLINE "-o"