X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a1dda68beb91ffc5514501ded2e03c3fe42b760..fbcf6ab31cae1988be858f9f894dafe529c575d7:/src/smpi/smpif90.in

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 7097dc385e..aa51d8bb20 100644
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# Copyright (c) 2012-2018. The SimGrid Team. All rights reserved.
+# Copyright (c) 2012-2019. 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.
@@ -8,7 +8,7 @@
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
-F90=@SMPI_Fortran_COMPILER@
+REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
@@ -16,7 +16,12 @@ CMAKE_LINKARGS="-L@libdir@"
 @SMPITOOLS_SH@
 
 list_set FFLAGS @SMPI_Fortran_FLAGS@
-list_set LINKARGS "-shared" "-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
 
@@ -28,15 +33,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)"
-    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}"
+    #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}"
 }
 
 NEEDS_OUTPUT=1
 
-list_set CMDLINE "${F90}"
+list_set CMDLINE "${REAL_FORTRAN_COMPILER}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
     ARG="$1"
@@ -48,13 +53,15 @@ while [ $# -gt 0 ]; do
             list_add CMDLINE "-c"
             ;;
         *.f90)
-            ORIGFILE="${ARG%.f90}"
+            FILENAME=`basename ${ARG}`
             TMPFILE=$(mymktemp "${ARG}" ".f90")
+            ORIGFILE="${FILENAME%.f90}"
             filter_and_compile
             ;;
         *.F90)
-            ORIGFILE="${ARG%.F90}"
+            FILENAME=`basename ${ARG}`
             TMPFILE=$(mymktemp "${ARG}" ".F90")
+            ORIGFILE="${FILENAME%.F90}"
             filter_and_compile
             ;;
         '-version' | '--version')
@@ -66,7 +73,7 @@ while [ $# -gt 0 ]; do
             exit 0
             ;;
         '-compiler-version' | '--compiler-version')
-            ${F90} --version
+            ${REAL_FORTRAN_COMPILER} --version
             ;;
         -o)
             list_add CMDLINE "-o$1"
@@ -79,7 +86,6 @@ while [ $# -gt 0 ]; do
     esac
 done
 
-
 if [ $NEEDS_OUTPUT -ne 0 ]; then
    list_add CMDLINE "-o${ORIGFILE}.o"
 fi