#3752 use icc in the nightly builds refs[t:3752]

git-svn-id: file:///svn/toku/tokudb@34009 c7de825b-a66e-492c-adef-691d508d4ae1

scripts/build.check.bash

@@ -239,7 +239,7 @@ function build() {
 
     # debug build
     runcmd 0 $productbuilddir make clean -s >>$tracefile 2>&1
-    runcmd 0 $productbuilddir make -s DEBUG=1 >>$tracefile 2>&1
+    runcmd 0 $productbuilddir make release -s DEBUG=1 >>$tracefile 2>&1
 
     # run the brtloader tests with a debug build
     runcmd 0 $productbuilddir/newbrt/tests make check_brtloader -k -j$makejobs DEBUG=1 -s SUMMARIZE=1 >>$tracefile 2>&1
@@ -319,6 +319,8 @@ dowindows=0
 oschoice=linux
 deleteafter=0
 j=-1
+cc=gcc44
+cxx=g++44
 
 arg=$1;
 shopt -s compat31 #Necessary in some flavors of linux and windows
@@ -331,10 +333,6 @@ if [ "$arg" = "--windows=yes" -o "$arg" = "--windows=1" ] ; then
     oschoice=windows
 fi
 
-# setup default compiler
-if [ "$CC" = "" ] ; then export CC=gcc; fi
-if [ "$CXX" = "" ] ; then export CXX=g++; fi
-
 # import the environment
 while [ $# -gt 0 ] ; do
     arg=$1; shift
@@ -346,19 +344,6 @@ while [ $# -gt 0 ] ; do
         dowindows=0
     elif [ "$arg" = "--windows=yes" -o "$arg" = "--windows=1" ] ; then
         usage; exit 1
-    elif [ $arg = "--gcc44" ] ; then
-	export CC=gcc44; export CXX=g++44
-    elif [ $arg = "--icc" ] ; then
-	export CC=icc; export CXX=icpc
-	d=/opt/intel/bin
-	if [ -d $d ] ; then
-	    export PATH=$d:$PATH
-	    . $d/compilervars.sh intel64
-	fi
-	d=/opt/intel/cilkutil/bin
-	if [ -d $d ] ; then
-	    export PATH=$d:$PATH
-	fi
     elif [[ $arg =~ ^--(.*)=(.*) ]] ; then
 	eval ${BASH_REMATCH[1]}=${BASH_REMATCH[2]}
     else
@@ -366,6 +351,22 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
+# setup default compiler
+if [ "$CC" = "" ] ; then export CC=$cc; fi
+if [ "$CXX" = "" ] ; then export CXX=$cxx; fi
+
+if [ $CC = icc ] ; then
+    d=/opt/intel/bin
+    if [ -d $d ] ; then
+	export PATH=$d:$PATH
+	. $d/compilervars.sh intel64
+    fi
+    d=/opt/intel/cilkutil/bin
+    if [ -d $d ] ; then
+	export PATH=$d:$PATH
+    fi
+fi
+
 if [ $j -ne "-1" ] ; then makejobs=$j; fi
 if [ $makejobs -eq 0 ] ; then usage; exit 1; fi
 

scripts/build.check.icc.bash

@@ -313,6 +313,8 @@ dowindows=0
 oschoice=linux
 deleteafter=0
 j=-1
+cc=icc
+cxx=icpc
 
 arg=$1;
 shopt -s compat31 #Necessary in some flavors of linux and windows
@@ -325,10 +327,6 @@ if [ "$arg" = "--windows=yes" -o "$arg" = "--windows=1" ] ; then
     oschoice=windows
 fi
 
-# setup default compiler
-if [ "$CC" = "" ] ; then export CC=icc; fi
-if [ "$CXX" = "" ] ; then export CXX=icpc; fi
-
 # import the environment
 while [ $# -gt 0 ] ; do
     arg=$1; shift
@@ -340,10 +338,6 @@ while [ $# -gt 0 ] ; do
         dowindows=0
     elif [ "$arg" = "--windows=yes" -o "$arg" = "--windows=1" ] ; then
         usage; exit 1
-    elif [ $arg = "--gcc44" ] ; then
-	export CC=gcc44; export CXX=g++44
-    elif [ $arg = "--icc" ] ; then
-	export CC=icc; export CXX=icpc
     elif [[ $arg =~ ^--(.*)=(.*) ]] ; then
 	eval ${BASH_REMATCH[1]}=${BASH_REMATCH[2]}
     else
@@ -351,6 +345,10 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
+# setup default compiler
+if [ "$CC" = "" ] ; then export CC=$cc; fi
+if [ "$CXX" = "" ] ; then export CXX=$cxx; fi
+
 if [ $CC = icc ] ; then
     d=/opt/intel/bin
     if [ -d $d ] ; then