Remove old workaround.

[simgrid.git] / tools / jenkins / build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 3f24abe..eccc65a 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -81,7 +81,7 @@ if [ -f /mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe ]; then
     PATH="/mnt/c/Windows/System32/WindowsPowerShell/v1.0/:$PATH"
     major=$(powershell.exe -command "[environment]::OSVersion.Version.Major" | sed 's/\r//g')
     build=$(powershell.exe -command "[environment]::OSVersion.Version.Build"| sed 's/\r//g')
-    ver= "$major v$build - WSL $os $ver"
+    ver="$major v$build - WSL $os $ver"
     os=Windows
 fi
 
@@ -183,13 +183,6 @@ else
   MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
 fi
 
-if [ "$os" = "NixOS" ] && [ "$(gcc -dumpversion)" = "7.4.0" ]; then
-    echo "Temporary disable LTO, believed to be broken on this system."
-    MAY_DISABLE_LTO=-Denable_lto=OFF
-else
-    MAY_DISABLE_LTO=
-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") \
@@ -200,7 +193,9 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
   -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_jedule=OFF -Denable_java=ON -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
+  -Denable_jedule=OFF -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} \
+  -Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
+  -Denable_MSG=$(onoff test "$build_mode" = "ModelChecker") \
   $SRCFOLDER
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
 set +x