A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'torus'
[simgrid.git]
/
src
/
smpi
/
smpicc.in
diff --git
a/src/smpi/smpicc.in
b/src/smpi/smpicc.in
index
5c465c7
..
e5270a2
100755
(executable)
--- a/
src/smpi/smpicc.in
+++ b/
src/smpi/smpicc.in
@@
-17,8
+17,7
@@
else
list_add LINKARGS "@libdir@\libsimgrid.dll"
fi
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
while [ $# -gt 0 ]; do
ARG="$1"
shift
@@
-26,23
+25,26
@@
while [ $# -gt 0 ]; do
-c)
CMAKE_LINKARGS=""
LINKARGS=""
-c)
CMAKE_LINKARGS=""
LINKARGS=""
- list_add CMD
LINE
"-c"
+ list_add CMD
ARGS
"-c"
;;
*.c)
SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
if [ -z "$SRCFILE" ] ; then
SRCFILE="$ARG"
fi
;;
*.c)
SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
if [ -z "$SRCFILE" ] ; then
SRCFILE="$ARG"
fi
- list_add CMD
LINE
"${SRCFILE}"
+ list_add CMD
ARGS
"${SRCFILE}"
;;
*)
;;
*)
- list_add CMD
LINE
"${ARG}"
+ list_add CMD
ARGS
"${ARG}"
;;
esac
done
;;
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 ${INCLUDEARGS}
list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
+list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"
eval $(list_get CMDLINE)
list_add_not_empty CMDLINE "${LINKARGS}"
eval $(list_get CMDLINE)