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
allow operation to execute more than one function at start and end
[simgrid.git]
/
src
/
smpi
/
smpicc.in
diff --git
a/src/smpi/smpicc.in
b/src/smpi/smpicc.in
index 9eaaed5163e800bbee1a63fdc03f355d4a3a1aab..4379ffea91ce265ec1b93190750f7348ad02f32e 100755
(executable)
--- a/
src/smpi/smpicc.in
+++ b/
src/smpi/smpicc.in
@@
-1,21
+1,21
@@
#!/usr/bin/env sh
#!/usr/bin/env sh
-# Copyright (c) 2007-202
0
. The SimGrid Team.
+# Copyright (c) 2007-202
3
. 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
@"
+SIMGRID_GITHASH="@
GIT_VERSION
@"
CC=@CMAKE_C_COMPILER@
CC=@CMAKE_C_COMPILER@
-INCLUDEARGS="@includeflag@"
-CMAKE_LINKARGS="-L@libdir@"
-
@SMPITOOLS_SH@
@SMPITOOLS_SH@
+list_set INCLUDEARGS @includeflag@
+list_set CMAKE_LINKARGS "-L@libdir@"
+
# Don't use -Wl,-z-defs with Clang and address sanitizer
if [ "@CMAKE_C_COMPILER_ID@" = "Clang" ] && [ "@HAVE_SANITIZER_ADDRESS@" = "TRUE" ]; then
LINKER_UNDEFINED_ERROR=""
# Don't use -Wl,-z-defs with Clang and address sanitizer
if [ "@CMAKE_C_COMPILER_ID@" = "Clang" ] && [ "@HAVE_SANITIZER_ADDRESS@" = "TRUE" ]; then
LINKER_UNDEFINED_ERROR=""
@@
-25,11
+25,7
@@
fi
list_set CFLAGS @SMPI_C_FLAGS@
list_add LINKARGS
list_set CFLAGS @SMPI_C_FLAGS@
list_add LINKARGS
-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 "-fPIC"
+if [ "x@APPLE@" = "x1" ]; then
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
@@
-37,18
+33,17
@@
elif [ "x@APPLE@" = "x1" ]; then
echo "Warning: smpicc pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
if [ "x${SMPI_NO_UNDEFINED_CHECK}" = "x" ]; then
echo "Warning: smpicc pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
if [ "x${SMPI_NO_UNDEFINED_CHECK}" = "x" ]; then
- list_add LINKARGS "-lsimgrid" ${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
+ list_add LINKARGS "-lsimgrid"
"-lm"
${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
fi
else
fi
else
- list_add CFLAGS "-fPIC"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
- list_add CFLAGS "-include" "
\"@includedir@/smpi/smpi_helpers.h\"
"
+ 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
if [ "x${SMPI_NO_UNDEFINED_CHECK}" = "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
if [ "x${SMPI_NO_UNDEFINED_CHECK}" = "x" ]; then
- list_add LINKARGS "-lsimgrid" ${LINKER_UNDEFINED_ERROR:+"-Wl,-z,defs"}
+ list_add LINKARGS "-lsimgrid"
"-lm"
${LINKER_UNDEFINED_ERROR:+"-Wl,-z,defs"}
fi
fi
fi
fi
@@
-67,7
+62,7
@@
while [ $# -gt 0 ]; do
if [ -z "$SRCFILE" ] ; then
SRCFILE="$ARG"
fi
if [ -z "$SRCFILE" ] ; then
SRCFILE="$ARG"
fi
- list_add CMDARGS "
\"${SRCFILE}\"
"
+ list_add CMDARGS "
${SRCFILE}
"
;;
'-version' | '--version')
printf '%b\n' "$SIMGRID_VERSION"
;;
'-version' | '--version')
printf '%b\n' "$SIMGRID_VERSION"
@@
-78,7
+73,7
@@
while [ $# -gt 0 ]; do
exit 0
;;
'-trace-call-location')
exit 0
;;
'-trace-call-location')
- list_add
_not_empty
CMDARGS "-DTRACE_CALL_LOCATION"
+ list_add CMDARGS "-DTRACE_CALL_LOCATION"
;;
'-compiler-version' | '--compiler-version')
${CC} --version
;;
'-compiler-version' | '--compiler-version')
${CC} --version
@@
-93,9
+88,11
@@
while [ $# -gt 0 ]; do
esac
done
esac
done
+list_add CMDARGS "-fPIC"
+
list_set CMDLINE "${CC}"
list_add_not_empty CMDLINE "${CFLAGS}"
list_set CMDLINE "${CC}"
list_add_not_empty CMDLINE "${CFLAGS}"
-list_add_not_empty CMDLINE
${INCLUDEARGS}
+list_add_not_empty CMDLINE
"${INCLUDEARGS}"
list_add_not_empty CMDLINE "${CMAKE_LINKARGS}"
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"
list_add_not_empty CMDLINE "${CMAKE_LINKARGS}"
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"
@@
-105,4
+102,4
@@
if [ "x$VERBOSE" = x1 ] || [ "x$show" = x1 ] ; then
echo "$@"
[ "x$show" = x1 ] && exit 0
fi
echo "$@"
[ "x$show" = x1 ] && exit 0
fi
-
eval
"$@"
+"$@"