Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor

[simgrid.git] / src / smpi / smpicc.in

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 833cfa8..38240c0 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -6,10 +6,10 @@ INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
 
 if [ "@WIN32@" != "1" ]; then
-  LINKARGS="-lsimgrid -lsmpi -lm"
-  CFLAGS="-O2 -Dmain=smpi_simulated_main"
+  CFLAGS="-Dmain=smpi_simulated_main__"
+  LINKARGS="-lsimgrid -lsmpi"
 else
-  CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
+  CFLAGS="-include @includedir@/smpi/smpi_main.h"
   LINKARGS="@libdir@\libsimgrid.dll @libdir@\libsmpi.dll"
 fi
 
@@ -19,6 +19,7 @@ while [ -n "$1" ]; do
   shift
   case "${ARG}" in
    -c)
+      CMAKE_LINKARGS=""
       LINKARGS=""
       CMDLINE="${CMDLINE} -c "
       ;;