X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc0010abcda73a601f75f7c96fc1cc09918ee2cd..464d34f9d99aad1e50166cea9ed461f46c6099dd:/tools/jenkins/build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 28ee7c0131..2f23a21a79 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -151,11 +151,17 @@ if [ "$os" = "Debian" ] || [ "$os" = "Ubuntu" ] ; then
     have_NS3="yes"
   fi
 fi
-if [ "$os" = "NixOS" ] ; then
+if [ "$os" = "nixos" ] ; then
   have_NS3="yes"
 fi
 echo "XX have_NS3: ${have_NS3}"
 
+SIMGRID_PYTHON_LIBDIR=""
+if [ "$os" = "nixos" ] ; then
+  SIMGRID_PYTHON_LIBDIR="/home/ci/simgrid_install/lib64"
+fi
+echo "XX SIMGRID_PYTHON_LIBDIR: ${SIMGRID_PYTHON_LIBDIR}"
+
 # This is for Windows:
 PATH="$WORKSPACE/build/lib:$PATH"
 
@@ -191,29 +197,31 @@ else
   MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
 fi
 
-if [ "$os" = "CentOS" ] && [ "$(ld -v | cut -d\  -f4 | cut -c1-4)" = "2.30" ]; then
-  echo "Temporary disable LTO, believed to be broken on this system."
-  MAY_DISABLE_LTO=-Denable_lto=OFF
-else
-  MAY_DISABLE_LTO=
+if [ "$os" = "CentOS" ]; then
+    if [ "$(ld -v | cut -d\  -f4 | cut -c1-4)" = "2.30" ]; then
+        echo "Temporary disable LTO, believed to be broken on this system."
+        MAY_DISABLE_LTO=-Denable_lto=OFF
+    else
+        MAY_DISABLE_LTO=
+    fi
 fi
 
 cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
-  -Denable_smpi_ISP_testsuite=$(onoff test "$build_mode" = "ModelChecker") \
+  -Denable_smpi_MBI_testsuite=OFF \
   -Denable_compile_optimizations=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" = "Debug") \
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
   -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
-  -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
+  -DSIMGRID_PYTHON_LIBDIR=${SIMGRID_PYTHON_LIBDIR} \
+  ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
   -Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
   -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
   -DLTO_EXTRA_FLAG="auto" \
   "$SRCFOLDER"
-#  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
 set +x
 
 make -j $NUMBER_OF_PROCESSORS VERBOSE=1 tests