Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
factorize the fact that C++ compiles with -std=gnu++11 in all cases
authorMartin Quinson <martin.quinson@loria.fr>
Tue, 17 Apr 2018 14:47:37 +0000 (16:47 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Tue, 17 Apr 2018 14:47:37 +0000 (16:47 +0200)
src/smpi/smpicxx.in

index eb74fd1..0af62a7 100755 (executable)
@@ -16,20 +16,20 @@ CMAKE_LINKARGS="-L@libdir@"
 
 @SMPITOOLS_SH@
 
-list_set CXXFLAGS
-list_set LINKARGS
+list_set CXXFLAGS "-std=gnu++11"
+list_set LINKARGS "-std=gnu++11"
 if [ "@WIN32@" != "1" ]; then
     # list_add CXXFLAGS "-Dmain=smpi_simulated_main_"
-    list_add CXXFLAGS "-fpic" "-std=gnu++11"
+    list_add CXXFLAGS "-fpic"
     if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
        list_add LINKARGS "-shared"
     else
        echo "Warning: smpicxx pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
     fi
-    list_add LINKARGS "-lsimgrid" "-std=gnu++11"
+    list_add LINKARGS "-lsimgrid"
 else
-    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h" "-std=gnu++11"
-    list_add LINKARGS "@libdir@\libsimgrid.dll" "-std=gnu++11"
+    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
+    list_add LINKARGS "@libdir@\libsimgrid.dll"
 fi
 
 list_set CMDARGS