From 9086aa5f3fe6cae7f4de7f10bea0a21509c6c3d8 Mon Sep 17 00:00:00 2001 From: Geoff Ericksson Date: Mon, 9 May 2016 09:44:04 +1000 Subject: [PATCH] Add gcc610 variables for Centos 6 & 7 --- etc.cake.centos.6 | 72 +++++++++++++++++++++++++++++++++++++++++++++++ etc.cake.centos.7 | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/etc.cake.centos.6 b/etc.cake.centos.6 index 85227f81..4fb13d1b 100644 --- a/etc.cake.centos.6 +++ b/etc.cake.centos.6 @@ -508,6 +508,78 @@ CAKE_GCC520_ZPROFILE_LINKFLAGS="$CAKE_GCC520_PROFILE_LINKFLAGS -lzprofile" CAKE_GCC520_ZPROFILE_TESTPREFIX="" CAKE_GCC520_ZPROFILE_POSTPREFIX="timeout 120" +CAKE_GCC610_ID="GCC61" +CAKE_GCC610_CPP="ccache g++61 " +CAKE_GCC610_CXX="ccache g++61 " +CAKE_GCC610_CC="ccache gcc61 " +CAKE_GCC610_LINKER="g++61 " +CAKE_GCC610_CPPFLAGS=" -I . -std=c++1z -isystem /opt/gcc61/include/c++/6.1.0/" +CAKE_GCC610_CFLAGS=" -I . -fPIC -g -Wall" +CAKE_GCC610_CXXFLAGS=" -I . -std=c++1z -isystem /opt/gcc61/include/c++/6.1.0/ -fPIC -g -Wall -fdiagnostics-color=auto" +CAKE_GCC610_LINKFLAGS="-fPIC -Wall -Werror -Xlinker --build-id" +CAKE_GCC610_TESTPREFIX="timeout 300 valgrind --quiet --error-exitcode=1" +CAKE_GCC610_POSTPREFIX="timeout 120" + +CAKE_GCC610_DEBUG_ID="$CAKE_GCC610_ID" +CAKE_GCC610_DEBUG_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_DEBUG_CC="$CAKE_GCC610_CC" +CAKE_GCC610_DEBUG_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_DEBUG_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_DEBUG_CPPFLAGS="${CAKE_GCC610_CPPFLAGS}" +CAKE_GCC610_DEBUG_CFLAGS="${CAKE_GCC610_CFLAGS}" +CAKE_GCC610_DEBUG_CXXFLAGS="${CAKE_GCC610_CXXFLAGS}" +CAKE_GCC610_DEBUG_LINKFLAGS="$CAKE_GCC610_LINKFLAGS" +CAKE_GCC610_DEBUG_TESTPREFIX="valgrind --quiet --error-exitcode=1" +CAKE_GCC610_DEBUG_POSTPREFIX="timeout 120" + +CAKE_GCC610_RELEASE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_RELEASE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_RELEASE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_RELEASE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_RELEASE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_RELEASE_CPPFLAGS="${CAKE_GCC610_CPPFLAGS}" +CAKE_GCC610_RELEASE_CFLAGS="${CAKE_GCC610_CFLAGS} -O3 -DNDEBUG -finline-functions -Wno-inline" +CAKE_GCC610_RELEASE_CXXFLAGS="${CAKE_GCC610_CXXFLAGS} -O3 -DNDEBUG -finline-functions -Wno-inline" +CAKE_GCC610_RELEASE_LINKFLAGS="${CAKE_GCC610_LINKFLAGS}" +CAKE_GCC610_RELEASE_TESTPREFIX="" +CAKE_GCC610_RELEASE_POSTPREFIX="timeout 120" + +CAKE_GCC610_PROFILE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_PROFILE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_PROFILE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_PROFILE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_PROFILE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_PROFILE_CPPFLAGS="${CAKE_GCC610_RELEASE_CPPFLAGS}" +CAKE_GCC610_PROFILE_CFLAGS="${CAKE_GCC610_RELEASE_CFLAGS} -pg -g" +CAKE_GCC610_PROFILE_CXXFLAGS="${CAKE_GCC610_RELEASE_CXXFLAGS} -pg -g" +CAKE_GCC610_PROFILE_LINKFLAGS="-O3 -Wall -pg -g" +CAKE_GCC610_PROFILE_TESTPREFIX="" +CAKE_GCC610_PROFILE_POSTPREFIX="timeout 120" + +CAKE_GCC610_COVERAGE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_COVERAGE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_COVERAGE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_COVERAGE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_COVERAGE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_COVERAGE_CPPFLAGS="${CAKE_GCC610_CPPFLAGS}" +CAKE_GCC610_COVERAGE_CFLAGS="${CAKE_GCC610_CFLAGS} -fPIC -O0 -fno-inline -Wall -g -fprofile-arcs -ftest-coverage" +CAKE_GCC610_COVERAGE_CXXFLAGS="${CAKE_GCC610_CXXFLAGS} -fPIC -O0 -fno-inline -Wall -g -fprofile-arcs -ftest-coverage" +CAKE_GCC610_COVERAGE_LINKFLAGS="-fPIC -O0 -fno-inline -Wall -g -fprofile-arcs -ftest-coverage" +CAKE_GCC610_COVERAGE_TESTPREFIX="valgrind --quiet --error-exitcode=1" +CAKE_GCC610_COVERAGE_POSTPREFIX="timeout 120" + +CAKE_GCC610_ZPROFILE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_ZPROFILE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_ZPROFILE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_ZPROFILE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_ZPROFILE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_ZPROFILE_CPPFLAGS="${CAKE_GCC610_PROFILE_CPPFLAGS} -DZPROFILE" +CAKE_GCC610_ZPROFILE_CFLAGS="${CAKE_GCC610_PROFILE_CFLAGS} -DZPROFILE -DNDEBUG" +CAKE_GCC610_ZPROFILE_CXXFLAGS="${CAKE_GCC610_PROFILE_CXXFLAGS} -DZPROFILE" +CAKE_GCC610_ZPROFILE_LINKFLAGS="$CAKE_GCC610_PROFILE_LINKFLAGS -lzprofile" +CAKE_GCC610_ZPROFILE_TESTPREFIX="" +CAKE_GCC610_ZPROFILE_POSTPREFIX="timeout 120" + CAKE_CLANG_ID="CLANG" CAKE_CLANG_CPP="ccache clang++ " CAKE_CLANG_CC="ccache clang " diff --git a/etc.cake.centos.7 b/etc.cake.centos.7 index 86228e16..ca01386e 100644 --- a/etc.cake.centos.7 +++ b/etc.cake.centos.7 @@ -183,6 +183,78 @@ CAKE_GCC520_ZPROFILE_LINKFLAGS="$CAKE_GCC520_PROFILE_LINKFLAGS -lzprofile" CAKE_GCC520_ZPROFILE_TESTPREFIX="" CAKE_GCC520_ZPROFILE_POSTPREFIX="timeout 120" +CAKE_GCC610_ID="GCC61" +CAKE_GCC610_CPP="ccache g++61 " +CAKE_GCC610_CXX="ccache g++61 " +CAKE_GCC610_CC="ccache gcc61 " +CAKE_GCC610_LINKER="g++61 " +CAKE_GCC610_CPPFLAGS=" -I . -std=c++1z -isystem /opt/gcc61/include/c++/6.1.0/" +CAKE_GCC610_CFLAGS=" -I . -fPIC -g -Wall" +CAKE_GCC610_CXXFLAGS=" -I . -std=c++1z -isystem /opt/gcc61/include/c++/6.1.0/ -fPIC -g -Wall -fdiagnostics-color=auto" +CAKE_GCC610_LINKFLAGS="-fPIC -Wall -Werror -Xlinker --build-id" +CAKE_GCC610_TESTPREFIX="timeout 300 valgrind --quiet --error-exitcode=1" +CAKE_GCC610_POSTPREFIX="timeout 120" + +CAKE_GCC610_DEBUG_ID="$CAKE_GCC610_ID" +CAKE_GCC610_DEBUG_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_DEBUG_CC="$CAKE_GCC610_CC" +CAKE_GCC610_DEBUG_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_DEBUG_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_DEBUG_CPPFLAGS="${CAKE_GCC610_CPPFLAGS}" +CAKE_GCC610_DEBUG_CFLAGS="${CAKE_GCC610_CFLAGS}" +CAKE_GCC610_DEBUG_CXXFLAGS="${CAKE_GCC610_CXXFLAGS}" +CAKE_GCC610_DEBUG_LINKFLAGS="$CAKE_GCC610_LINKFLAGS" +CAKE_GCC610_DEBUG_TESTPREFIX="valgrind --quiet --error-exitcode=1" +CAKE_GCC610_DEBUG_POSTPREFIX="timeout 120" + +CAKE_GCC610_RELEASE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_RELEASE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_RELEASE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_RELEASE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_RELEASE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_RELEASE_CPPFLAGS="${CAKE_GCC610_CPPFLAGS}" +CAKE_GCC610_RELEASE_CFLAGS="${CAKE_GCC610_CFLAGS} -O3 -DNDEBUG -finline-functions -Wno-inline" +CAKE_GCC610_RELEASE_CXXFLAGS="${CAKE_GCC610_CXXFLAGS} -O3 -DNDEBUG -finline-functions -Wno-inline" +CAKE_GCC610_RELEASE_LINKFLAGS="${CAKE_GCC610_LINKFLAGS}" +CAKE_GCC610_RELEASE_TESTPREFIX="" +CAKE_GCC610_RELEASE_POSTPREFIX="timeout 120" + +CAKE_GCC610_PROFILE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_PROFILE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_PROFILE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_PROFILE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_PROFILE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_PROFILE_CPPFLAGS="${CAKE_GCC610_RELEASE_CPPFLAGS}" +CAKE_GCC610_PROFILE_CFLAGS="${CAKE_GCC610_RELEASE_CFLAGS} -pg -g" +CAKE_GCC610_PROFILE_CXXFLAGS="${CAKE_GCC610_RELEASE_CXXFLAGS} -pg -g" +CAKE_GCC610_PROFILE_LINKFLAGS="-O3 -Wall -pg -g" +CAKE_GCC610_PROFILE_TESTPREFIX="" +CAKE_GCC610_PROFILE_POSTPREFIX="timeout 120" + +CAKE_GCC610_COVERAGE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_COVERAGE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_COVERAGE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_COVERAGE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_COVERAGE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_COVERAGE_CPPFLAGS="${CAKE_GCC610_CPPFLAGS}" +CAKE_GCC610_COVERAGE_CFLAGS="${CAKE_GCC610_CFLAGS} -fPIC -O0 -fno-inline -Wall -g -fprofile-arcs -ftest-coverage" +CAKE_GCC610_COVERAGE_CXXFLAGS="${CAKE_GCC610_CXXFLAGS} -fPIC -O0 -fno-inline -Wall -g -fprofile-arcs -ftest-coverage" +CAKE_GCC610_COVERAGE_LINKFLAGS="-fPIC -O0 -fno-inline -Wall -g -fprofile-arcs -ftest-coverage" +CAKE_GCC610_COVERAGE_TESTPREFIX="valgrind --quiet --error-exitcode=1" +CAKE_GCC610_COVERAGE_POSTPREFIX="timeout 120" + +CAKE_GCC610_ZPROFILE_ID="$CAKE_GCC610_ID" +CAKE_GCC610_ZPROFILE_CPP="$CAKE_GCC610_CPP" +CAKE_GCC610_ZPROFILE_CC="$CAKE_GCC610_CC" +CAKE_GCC610_ZPROFILE_CXX="$CAKE_GCC610_CXX" +CAKE_GCC610_ZPROFILE_LINKER="$CAKE_GCC610_LINKER" +CAKE_GCC610_ZPROFILE_CPPFLAGS="${CAKE_GCC610_PROFILE_CPPFLAGS} -DZPROFILE" +CAKE_GCC610_ZPROFILE_CFLAGS="${CAKE_GCC610_PROFILE_CFLAGS} -DZPROFILE -DNDEBUG" +CAKE_GCC610_ZPROFILE_CXXFLAGS="${CAKE_GCC610_PROFILE_CXXFLAGS} -DZPROFILE" +CAKE_GCC610_ZPROFILE_LINKFLAGS="$CAKE_GCC610_PROFILE_LINKFLAGS -lzprofile" +CAKE_GCC610_ZPROFILE_TESTPREFIX="" +CAKE_GCC610_ZPROFILE_POSTPREFIX="timeout 120" + CAKE_CLANG_ID="CLANG" CAKE_CLANG_CPP="ccache clang++ " CAKE_CLANG_CC="ccache clang "