X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba66c0a53a3284954996b301af67e23b04513d87..7c290a2f35aea837ef610146cf7b1f1ad5c45455:/src/smpi/smpif90.in

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 60d8d59b9a..9e30ca34bb 100644
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+# Copyright (c) 2012-2014. 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.
+
 F90=@GFORTRAN_EXE@
 
 INCLUDEARGS="@includeflag@"
@@ -18,7 +24,8 @@ cleanup () {
 }
 trap 'cleanup' EXIT
 
-list_set CMDLINE
+list_set CMDLINE "${F90}"
+list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
     ARG="$1"
     shift
@@ -42,7 +49,9 @@ while [ $# -gt 0 ]; do
     esac
 done
 
-list_set CMDLINE "${FFLAGS}" "${CMDLINE}" ${INCLUDEARGS} ${CMAKE_LINKARGS} "${LINKARGS}"
-eval $(list_get CMDLINE)
+list_add_not_empty CMDLINE ${INCLUDEARGS}
+list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
+list_add_not_empty CMDLINE "${LINKARGS}"
 
-"${F90}" "$@"
+eval $(list_get CMDLINE)
+"$@"