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
Change a bit F2C handling
[simgrid.git]
/
src
/
smpi
/
smpicxx.in
diff --git
a/src/smpi/smpicxx.in
b/src/smpi/smpicxx.in
index
9d2a2c8
..
2822fdb
100755
(executable)
--- a/
src/smpi/smpicxx.in
+++ b/
src/smpi/smpicxx.in
@@
-20,7
+20,7
@@
list_set CXXFLAGS "-std=gnu++11" @SMPI_CXX_FLAGS@
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
- list_add CXXFLAGS "-f
pic
"
+ list_add CXXFLAGS "-f
PIC
"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
else
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
else
@@
-32,6
+32,9
@@
else
list_add LINKARGS "@libdir@\libsimgrid.dll"
fi
list_add LINKARGS "@libdir@\libsimgrid.dll"
fi
+# By default, we execute the commands instead of only showing them to cmake
+Show=
+
list_set CMDARGS
while [ $# -gt 0 ]; do
ARG="$1"
list_set CMDARGS
while [ $# -gt 0 ]; do
ARG="$1"
@@
-60,6
+63,10
@@
while [ $# -gt 0 ]; do
'-compiler-version' | '--compiler-version')
${CXX} --version
;;
'-compiler-version' | '--compiler-version')
${CXX} --version
;;
+ '-show'|'-compile-info'|'-link-info')
+ # Dry run displaying commands instead of executing them. Useful to cmake
+ Show=echo
+ ;;
*)
list_add CMDARGS "${ARG}"
;;
*)
list_add CMDARGS "${ARG}"
;;
@@
-74,4
+81,4
@@
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)
-"$@"
+
$Show
"$@"