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
use surf init/fini callbacks, no need for TRACE ones
[simgrid.git]
/
src
/
smpi
/
smpicc.in
diff --git
a/src/smpi/smpicc.in
b/src/smpi/smpicc.in
index
0d50597
..
fa5c02e
100755
(executable)
--- a/
src/smpi/smpicc.in
+++ b/
src/smpi/smpicc.in
@@
-1,12
+1,13
@@
#! /bin/sh
#! /bin/sh
-# Copyright (c) 2007-201
4
. The SimGrid Team.
+# Copyright (c) 2007-201
7
. The SimGrid Team.
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the license (GNU LGPL) which comes with this package.
SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the license (GNU LGPL) which comes with this package.
SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
+SIMGRID_GITHASH="@SIMGRID_GITHASH@"
CC=@CMAKE_C_COMPILER@
CC=@CMAKE_C_COMPILER@
@@
-18,8
+19,9
@@
CMAKE_LINKARGS="-L@libdir@"
list_set CFLAGS
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
list_set CFLAGS
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
- list_add CFLAGS "-Dmain=smpi_simulated_main_"
- list_add LINKARGS "-lsimgrid"
+ # list_add CFLAGS "-Dmain=smpi_simulated_main_"
+ list_add CFLAGS "-fpic"
+ list_add LINKARGS "-shared" "-lsimgrid"
else
list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
list_add LINKARGS "@libdir@\libsimgrid.dll"
else
list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
list_add LINKARGS "@libdir@\libsimgrid.dll"
@@
-42,10
+44,20
@@
while [ $# -gt 0 ]; do
fi
list_add CMDARGS "${SRCFILE}"
;;
fi
list_add CMDARGS "${SRCFILE}"
;;
- '-version' | '--version'
| '-v'
)
+ '-version' | '--version')
printf '%b\n' "$SIMGRID_VERSION"
exit 0
printf '%b\n' "$SIMGRID_VERSION"
exit 0
- ;;
+ ;;
+ "-git-version" | "--git-version")
+ printf '%b\n' "$SIMGRID_GITHASH"
+ exit 0
+ ;;
+ '-trace-call-location')
+ list_add_not_empty CMDARGS "-DTRACE_CALL_LOCATION"
+ ;;
+ '-compiler-version' | '--compiler-version')
+ ${CC} --version
+ ;;
*)
list_add CMDARGS "${ARG}"
;;
*)
list_add CMDARGS "${ARG}"
;;