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
Merge branch 'master' into mq
[simgrid.git]
/
src
/
smpi
/
smpicxx.in
diff --git
a/src/smpi/smpicxx.in
b/src/smpi/smpicxx.in
index c88cae14b85a7b9dab9b6e33ad0545a239a350bb..59c4eee3a97a44ea35be555eee50bc89b80b54d2 100755
(executable)
--- a/
src/smpi/smpicxx.in
+++ b/
src/smpi/smpicxx.in
@@
-1,6
+1,6
@@
#!/usr/bin/env sh
#!/usr/bin/env sh
-# Copyright (c) 2014-202
2
. The SimGrid Team.
+# Copyright (c) 2014-202
3
. 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
@@
-25,10
+25,7
@@
else
LINKER_UNDEFINED_ERROR="1"
fi
LINKER_UNDEFINED_ERROR="1"
fi
-if [ "x@WIN32@" = "x1" ]; then
- list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
- list_add LINKARGS "@libdir@\libsimgrid.dll"
-elif [ "x@APPLE@" = "x1" ]; then
+if [ "x@APPLE@" = "x1" ]; then
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
@@
-88,9
+85,7
@@
while [ $# -gt 0 ]; do
esac
done
esac
done
-if [ "x@WIN32@" != "x1" ]; then
- list_add CMDARGS "-fPIC"
-fi
+list_add CMDARGS "-fPIC"
list_set CMDLINE "${CXX}"
list_add_not_empty CMDLINE "${CXXFLAGS}"
list_set CMDLINE "${CXX}"
list_add_not_empty CMDLINE "${CXXFLAGS}"