From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 21 Mar 2018 08:04:43 +0000 (+0100)
Subject: Fix non-smpi builds on Mac OSX
X-Git-Tag: v3.19.1~9
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a8b018dfb61efc4a3ccda8d5123bfe27634cd354

Fix non-smpi builds on Mac OSX
---

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 85c6c0af15..40c6f00b3c 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -103,7 +103,7 @@ void SIMIX_context_mod_init()
   xbt_os_thread_key_create(&smx_current_context_key);
 #endif
 
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__))
   std::string priv = xbt_cfg_get_string("smpi/privatization");
   if (context_factory_name == "thread" && (priv == "dlopen" || priv == "yes" || priv == "default" || priv == "1")) {
     XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts.");
@@ -111,7 +111,7 @@ void SIMIX_context_mod_init()
   }
 #endif
 
-#if defined(__FreeBSD__)
+#if HAVE_SMPI && defined(__FreeBSD__)
   if (context_factory_name == "thread" && xbt_cfg_get_string("smpi/privatization") != "no"){
     XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts.");
     context_factory_name = "raw";