X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84e824746638f2b4c32c315bcfce655098d4e80b..4486ec3290d559d487b2b9edbd4b67b18a4659cc:/src/smpi/smpicc.in

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 9098f97353..5e0b376e06 100755
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -24,13 +24,13 @@ else
 fi
 
 list_set CFLAGS @SMPI_C_FLAGS@
-list_set LINKARGS "-lm"
+list_add LINKARGS
 if [ "x@WIN32@" = "x1" ]; then
     list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
     list_add LINKARGS "@libdir@\libsimgrid.dll"
 elif [ "x@APPLE@" = "x1" ]; then
     list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
-    list_add CFLAGS "-fpic"
+    list_add CFLAGS "-fPIC"
     if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
        list_add LINKARGS "-shared"
     else
@@ -39,7 +39,7 @@ elif [ "x@APPLE@" = "x1" ]; then
     list_add LINKARGS "-lsimgrid" ${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
 else
     list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
-    list_add CFLAGS "-fpic"
+    list_add CFLAGS "-fPIC"
     if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
        list_add LINKARGS "-shared"
     else
@@ -48,7 +48,6 @@ else
     list_add LINKARGS "-lsimgrid" ${LINKER_UNDEFINED_ERROR:+"-Wl,-z,defs"}
 fi
 
-
 list_set CMDARGS
 while [ $# -gt 0 ]; do
     ARG="$1"
@@ -80,7 +79,11 @@ while [ $# -gt 0 ]; do
         '-compiler-version' | '--compiler-version')
             ${CC} --version
             ;;
-        *)
+	'-show'|'-compile-info'|'-link-info')
+            # Dry run displaying commands instead of executing them. Useful to cmake
+	    show=1
+	    ;;
+	 *)
             list_add CMDARGS "${ARG}"
             ;;
     esac
@@ -94,4 +97,8 @@ list_add_not_empty CMDLINE "${CMDARGS}"
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+  echo "$@"
+  [ "x$show" = x1 ] && exit 0
+fi
 "$@"