X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1dd65290a48debfb62c80984ab6f88e820defb04..87fe018897fc0f3d573c18f4fa736ec38727dcf6:/buildtools/pipol/Experimental.sh

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index 8bf0676802..afa30ee5ee 100755
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -16,26 +16,20 @@ cd simgrid
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
 
+if [ -e /usr/bin/gcc-4.6 ] ; then
+export CC=gcc-4.6
+export CXX=g++-4.6
+else
+export CC=gcc
+export CXX=g++
+fi
+
 #Those 3 lines is for GTNetS
 #sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
 #SIMGRID_ROOT=`pwd`
 #export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
 
 #supernovae
-if [ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz" ] ; then
-cmake -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPILER=g++-4.6 \
--Denable_lua=on \
--Denable_tracing=on \
--Denable_smpi=on \
--Denable_supernovae=on \
--Denable_compile_optimizations=on \
--Denable_compile_warnings=on \
--Denable_lib_static=off \
--Denable_model-checking=off \
--Denable_latency_bound_tracking=off \
--Drelease=on \
--Denable_gtnets=off .
-else
 cmake \
 -Denable_lua=on \
 -Denable_tracing=on \
@@ -48,7 +42,6 @@ cmake \
 -Denable_latency_bound_tracking=off \
 -Drelease=on \
 -Denable_gtnets=off .
-fi
 
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure