Commit fd2e870d authored by Jan Möbius's avatar Jan Möbius
Browse files

Only use icecc with gcc

parent 0c84a156
Pipeline #285 passed with stage
...@@ -8,6 +8,7 @@ LANGUAGE=$2 ...@@ -8,6 +8,7 @@ LANGUAGE=$2
QTVERSION=$3 QTVERSION=$3
OPTIONS="" OPTIONS=""
MAKE_OPTIONS=""
BUILDPATH="" BUILDPATH=""
...@@ -17,16 +18,19 @@ if [ "$COMPILER" == "gcc" ]; then ...@@ -17,16 +18,19 @@ if [ "$COMPILER" == "gcc" ]; then
# without icecc: no options required # without icecc: no options required
OPTIONS="-DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc" 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 export ICECC_CXX=/usr/bin/g++ ; export ICECC_CC=/usr/bin/gcc
elif [ "$COMPILER" == "clang" ]; then 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" BUILDPATH="clang"
echo "Building with CLANG"; echo "Building with CLANG";
export ICECC_CXX=/usr/bin/clang++ ; export ICECC_CC=/usr/bin/clang
fi fi
if [ "$LANGUAGE" == "C++98" ]; then if [ "$LANGUAGE" == "C++98" ]; then
...@@ -80,7 +84,7 @@ cd build-release-$BUILDPATH ...@@ -80,7 +84,7 @@ cd build-release-$BUILDPATH
cmake -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../ cmake -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
#build it #build it
make -j16 make $MAKE_OPTIONS
######################################### #########################################
# Run Release Unittests # Run Release Unittests
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment