X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/292ac5b892a26eaf1bac04922331998ca4ba66b0..464d34f9d99aad1e50166cea9ed461f46c6099dd:/tools/jenkins/build.sh diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index e22568ad0e..2f23a21a79 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -151,13 +151,13 @@ 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 +if [ "$os" = "nixos" ] ; then SIMGRID_PYTHON_LIBDIR="/home/ci/simgrid_install/lib64" fi echo "XX SIMGRID_PYTHON_LIBDIR: ${SIMGRID_PYTHON_LIBDIR}" @@ -197,17 +197,19 @@ 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") \