X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de6dd9c41648c42ed5e8088be046408cc5ddb8c0..d12267992aceee77113c7cef4251b30ee1c9ea19:/src/smpi/smpicc.in

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index a508a38b32..5c465c70d4 100755
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -1,41 +1,49 @@
-#! /bin/bash
+#! /bin/sh
 
 CC=@CMAKE_C_COMPILER@
 
-INCLUDEARGS="-I@includedir@ -I@includedir@/smpi -I@CMAKE_BINARY_DIR@/include"
-CMAKE_LINKARGS="-L@CMAKE_LINKARGS@"
+INCLUDEARGS="@includeflag@"
+CMAKE_LINKARGS="-L@libdir@"
 
+@SMPITOOLS_SH@
+
+list_set CFLAGS
+list_set LINKARGS
 if [ "@WIN32@" != "1" ]; then
-  LINKARGS="-lsimgrid -lsmpi -lm"
-  CFLAGS="-O2 -Dmain=smpi_simulated_main"
+    list_add CFLAGS "-Dmain=smpi_simulated_main_"
+    list_add LINKARGS "-lsimgrid"
 else
-  CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
-  LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi.dll"
+    list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
+    list_add LINKARGS "@libdir@\libsimgrid.dll"
 fi
 
-CMDLINE=""
-while [ -n "$1" ]; do
-  ARG="$1"
-  shift
-  case "${ARG}" in
-   -c)
-      LINKARGS=""
-      CMDLINE="${CMDLINE} -c "
-      ;;
-   *.c)
-      SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
-      if [ -z $SRCFILE ] ; then
-         SRCFILE="$ARG"
-      fi
-      CMDLINE="${CMDLINE} ${SRCFILE} "
-      ;;
-   *)
-      CMDLINE="${CMDLINE} ${ARG} "
+list_set CMDLINE "${CC}"
+list_add_not_empty CMDLINE "${CFLAGS}"
+while [ $# -gt 0 ]; do
+    ARG="$1"
+    shift
+    case "${ARG}" in
+        -c)
+            CMAKE_LINKARGS=""
+            LINKARGS=""
+            list_add CMDLINE "-c"
+            ;;
+        *.c)
+            SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
+            if [ -z "$SRCFILE" ] ; then
+                SRCFILE="$ARG"
+            fi
+            list_add CMDLINE "${SRCFILE}"
+            ;;
+        *)
+            list_add CMDLINE "${ARG}"
       ;;
   esac
 done
 
-CMDLINE="${CC} ${CFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
+list_add_not_empty CMDLINE ${INCLUDEARGS}
+list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
+list_add_not_empty CMDLINE "${LINKARGS}"
 
-#echo "${CMDLINE}"
-${CMDLINE}
+eval $(list_get CMDLINE)
+"$@"