From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 24 Sep 2018 07:51:35 +0000 (+0200)
Subject: Restore CMDARGS before LINKARGS (commit 11c619824e2acd338705a14680d99aaad4b80506).
X-Git-Tag: v3_21~49
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4a840dbe2dd6f51b401a561de053db40233083dc

Restore CMDARGS before LINKARGS (commit 11c619824e2acd338705a14680d99aaad4b80506).

It was breaking smpi_ampi and smpi_replay under TSAN.
Remove redundant -std=gnu++11 from LINKARGS, so that it can be overridden on command line.
---

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 131f4e3210..fa06913da6 100755
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -17,7 +17,7 @@ CMAKE_LINKARGS="-L@libdir@"
 @SMPITOOLS_SH@
 
 list_set CXXFLAGS "-std=gnu++11"
-list_set LINKARGS "-std=gnu++11"
+list_set LINKARGS
 if [ "@WIN32@" != "1" ]; then
     # list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
     list_add CXXFLAGS "-fpic"
@@ -70,8 +70,8 @@ list_set CMDLINE "${CXX}"
 list_add_not_empty CMDLINE "${CXXFLAGS}"
 list_add_not_empty CMDLINE ${INCLUDEARGS}
 list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
-list_add_not_empty CMDLINE "${LINKARGS}"
 list_add_not_empty CMDLINE "${CMDARGS}"
+list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
 "$@"