From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 20 Jan 2014 08:56:53 +0000 (+0100)
Subject: Fix build when an older version of simgrid is already installed.
X-Git-Tag: v3_11_beta~144
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e67606cb94466ad834686a11799c045f8948873c

Fix build when an older version of simgrid is already installed.

Put CMAKE_LINKARGS before CMDARGS so that libsimgrid is caught from the
right directory.
---

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 5c465c70d4..e5270a230d 100755
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -17,8 +17,7 @@ else
     list_add LINKARGS "@libdir@\libsimgrid.dll"
 fi
 
-list_set CMDLINE "${CC}"
-list_add_not_empty CMDLINE "${CFLAGS}"
+list_set CMDARGS
 while [ $# -gt 0 ]; do
     ARG="$1"
     shift
@@ -26,23 +25,26 @@ while [ $# -gt 0 ]; do
         -c)
             CMAKE_LINKARGS=""
             LINKARGS=""
-            list_add CMDLINE "-c"
+            list_add CMDARGS "-c"
             ;;
         *.c)
             SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
             if [ -z "$SRCFILE" ] ; then
                 SRCFILE="$ARG"
             fi
-            list_add CMDLINE "${SRCFILE}"
+            list_add CMDARGS "${SRCFILE}"
             ;;
         *)
-            list_add CMDLINE "${ARG}"
+            list_add CMDARGS "${ARG}"
       ;;
   esac
 done
 
+list_set CMDLINE "${CC}"
+list_add_not_empty CMDLINE "${CFLAGS}"
 list_add_not_empty CMDLINE ${INCLUDEARGS}
 list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
+list_add_not_empty CMDLINE "${CMDARGS}"
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)