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
activity::CommImpl: stick to our naming standards for the fields
[simgrid.git]
/
src
/
smpi
/
smpicc.in
diff --git
a/src/smpi/smpicc.in
b/src/smpi/smpicc.in
index
bdac600
..
3cc7a6a
100755
(executable)
--- a/
src/smpi/smpicc.in
+++ b/
src/smpi/smpicc.in
@@
-1,6
+1,6
@@
#!/usr/bin/env sh
#!/usr/bin/env sh
-# Copyright (c) 2007-201
7
. The SimGrid Team.
+# Copyright (c) 2007-201
9
. The SimGrid Team.
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
@@
-16,23
+16,36
@@
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
@SMPITOOLS_SH@
+# Don't use -Wl,-z-defs with Clang and address sanitizer
+if [ "@CMAKE_C_COMPILER_ID@" = "Clang" -a "@HAVE_SANITIZER_ADDRESS@" = "TRUE" ]; then
+ LINKER_UNDEFINED_ERROR=""
+else
+ LINKER_UNDEFINED_ERROR="1"
+fi
+
list_set CFLAGS
list_set CFLAGS
-list_set LINKARGS
+list_set LINKARGS
"-lm"
if [ "x@WIN32@" = "x1" ]; then
list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
list_add LINKARGS "@libdir@\libsimgrid.dll"
elif [ "x@APPLE@" = "x1" ]; then
if [ "x@WIN32@" = "x1" ]; then
list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
list_add LINKARGS "@libdir@\libsimgrid.dll"
elif [ "x@APPLE@" = "x1" ]; then
+ list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add CFLAGS "-fpic"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
list_add CFLAGS "-fpic"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
+ else
+ echo "Warning: smpicc pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
fi
- list_add LINKARGS "-lsimgrid"
"-Wl,-undefined,error"
+ list_add LINKARGS "-lsimgrid"
${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
else
else
+ list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add CFLAGS "-fpic"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
list_add CFLAGS "-fpic"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
+ else
+ echo "Warning: smpicc pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
fi
- list_add LINKARGS "-lsimgrid"
"-Wl,-z,defs"
+ list_add LINKARGS "-lsimgrid"
${LINKER_UNDEFINED_ERROR:+"-Wl,-z,defs"}
fi
fi