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
reduce the differences between the s4u_async examples
[simgrid.git]
/
src
/
smpi
/
smpicc.in
diff --git
a/src/smpi/smpicc.in
b/src/smpi/smpicc.in
index
6902a25
..
a9765ac
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@
@@
-17,14
+18,18
@@
CMAKE_LINKARGS="-L@libdir@"
list_set CFLAGS
list_set LINKARGS
list_set CFLAGS
list_set LINKARGS
-if [ "@WIN32@" != "1" ]; then
- list_add CFLAGS "-Dmain=smpi_simulated_main_"
- list_add LINKARGS "-lsimgrid"
-else
+if [ "x@WIN32@" = "x1" ]; then
list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
list_add LINKARGS "@libdir@\libsimgrid.dll"
list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
list_add LINKARGS "@libdir@\libsimgrid.dll"
+elif [ "x@APPLE@" = "x1" ]; then
+ list_add CFLAGS "-fpic"
+ list_add LINKARGS "-shared" "-lsimgrid" "-Wl,-undefined,error"
+else
+ list_add CFLAGS "-fpic"
+ list_add LINKARGS "-shared" "-lsimgrid" "-Wl,-z,defs"
fi
fi
+
list_set CMDARGS
while [ $# -gt 0 ]; do
ARG="$1"
list_set CMDARGS
while [ $# -gt 0 ]; do
ARG="$1"
@@
-46,6
+51,13
@@
while [ $# -gt 0 ]; do
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
;;
'-compiler-version' | '--compiler-version')
${CC} --version
;;