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
[sonar] Less implicit conversions.
[simgrid.git]
/
src
/
smpi
/
smpicc.in
diff --git
a/src/smpi/smpicc.in
b/src/smpi/smpicc.in
index
dcf80e7
..
0662209
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-202
0
. The SimGrid Team.
+# Copyright (c) 2007-202
1
. 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
@@
-17,7
+17,7
@@
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
# Don't use -Wl,-z-defs with Clang and address sanitizer
@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
+if [ "@CMAKE_C_COMPILER_ID@" = "Clang"
] && [
"@HAVE_SANITIZER_ADDRESS@" = "TRUE" ]; then
LINKER_UNDEFINED_ERROR=""
else
LINKER_UNDEFINED_ERROR="1"
LINKER_UNDEFINED_ERROR=""
else
LINKER_UNDEFINED_ERROR="1"
@@
-29,23
+29,27
@@
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_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 CFLAGS "-fPIC"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
+ list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
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
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
- list_add LINKARGS "-lsimgrid" ${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
+ if [ "x${SMPI_NO_UNDEFINED_CHECK}" = "x" ]; then
+ list_add LINKARGS "-lsimgrid" "-lm" ${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
+ fi
else
else
- list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add CFLAGS "-fPIC"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CFLAGS "-fPIC"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
+ list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
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
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
- list_add LINKARGS "-lsimgrid" ${LINKER_UNDEFINED_ERROR:+"-Wl,-z,defs"}
+ if [ "x${SMPI_NO_UNDEFINED_CHECK}" = "x" ]; then
+ list_add LINKARGS "-lsimgrid" "-lm" ${LINKER_UNDEFINED_ERROR:+"-Wl,-z,defs"}
+ fi
fi
list_set CMDARGS
fi
list_set CMDARGS
@@
-59,7
+63,7
@@
while [ $# -gt 0 ]; do
list_add CMDARGS "-c"
;;
*.c)
list_add CMDARGS "-c"
;;
*.c)
- SRCFILE="$(readlink -f
${ARG}
2>/dev/null)"
+ SRCFILE="$(readlink -f
"${ARG}"
2>/dev/null)"
if [ -z "$SRCFILE" ] ; then
SRCFILE="$ARG"
fi
if [ -z "$SRCFILE" ] ; then
SRCFILE="$ARG"
fi
@@
-92,12
+96,12
@@
done
list_set CMDLINE "${CC}"
list_add_not_empty CMDLINE "${CFLAGS}"
list_add_not_empty CMDLINE ${INCLUDEARGS}
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
"${CMAKE_LINKARGS}"
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"
-eval
$(list_get CMDLINE)
-if [ "x$VERBOSE" = x1
-o
"x$show" = x1 ] ; then
+eval
"$(list_get CMDLINE)"
+if [ "x$VERBOSE" = x1
] || [
"x$show" = x1 ] ; then
echo "$@"
[ "x$show" = x1 ] && exit 0
fi
echo "$@"
[ "x$show" = x1 ] && exit 0
fi