Only use icecc with gcc

CI/ci-linux.sh

@@ -8,6 +8,7 @@ LANGUAGE=$2
 QTVERSION=$3
 
 OPTIONS=""
+MAKE_OPTIONS=""
 
 BUILDPATH=""
 
@@ -17,16 +18,19 @@ if [ "$COMPILER" == "gcc" ]; then
 
   # without icecc: no options required
   OPTIONS="-DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
+  MAKE_OPTIONS="-j16"
   export ICECC_CXX=/usr/bin/g++ ; export ICECC_CC=/usr/bin/gcc
+
 elif [ "$COMPILER" == "clang" ]; then
 
-#  Build options without icecc
-#  OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DGTEST_PREFIX=~/sw/gtest-1.7.0-clang/ "
+  OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DGTEST_PREFIX=~/sw/gtest-1.7.0-clang/ "
+
+#  Build options with icecc /not working due to strange symbol errors
+#  OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc -DGTEST_PREFIX=~/sw/gtest-1.7.0-clang/ "
+#  export ICECC_CXX=/usr/bin/clang++ ; export ICECC_CC=/usr/bin/clang
 
-  OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc -DGTEST_PREFIX=~/sw/gtest-1.7.0-clang/ "
   BUILDPATH="clang"
   echo "Building with CLANG";
-  export ICECC_CXX=/usr/bin/clang++ ; export ICECC_CC=/usr/bin/clang
 fi  
 
 if [ "$LANGUAGE" == "C++98" ]; then
@@ -80,7 +84,7 @@ cd build-release-$BUILDPATH
 cmake -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
 
 #build it
-make -j16
+make $MAKE_OPTIONS
 
 #########################################
 # Run Release Unittests