X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b348b0d4cff528bb4562222aa9f7874b8d30626f..54c3a9078274046acfa14099061c6fa1a9195723:/src/smpi/smpicxx.in?ds=sidebyside

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 886a8dd3f8..eb74fd1470 100755
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!/usr/bin/env sh
 
-# Copyright (c) 2014-2017. The SimGrid Team.
+# Copyright (c) 2014-2018. The SimGrid Team.
 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
@@ -20,11 +20,16 @@ list_set CXXFLAGS
 list_set LINKARGS
 if [ "@WIN32@" != "1" ]; then
     # list_add CXXFLAGS "-Dmain=smpi_simulated_main_"
-    list_add CXXFLAGS "-fpic"
-    list_add LINKARGS "-shared" "-lsimgrid"
+    list_add CXXFLAGS "-fpic" "-std=gnu++11"
+    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"
 else
-    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
-    list_add LINKARGS "@libdir@\libsimgrid.dll"
+    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h" "-std=gnu++11"
+    list_add LINKARGS "@libdir@\libsimgrid.dll" "-std=gnu++11"
 fi
 
 list_set CMDARGS