Add debug flags into ci scripts.

46 files changed, 101 insertions, 51 deletions

diff --git a/tools/ci/jobs/clang.sh b/tools/ci/jobs/clang.sh
index d4cd1726a..c72d9c94c 100755
--- a/tools/ci/jobs/clang.sh
+++ b/tools/ci/jobs/clang.sh
@@ -14,6 +14,8 @@ export LOGFILE=$1.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror
 run_make
diff --git a/tools/ci/jobs/clang3.sh b/tools/ci/jobs/clang3.sh
index e06f5bd1f..636e8517e 100755
--- a/tools/ci/jobs/clang3.sh
+++ b/tools/ci/jobs/clang3.sh
@@ -14,6 +14,8 @@ export LOGFILE=clang3.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/clang33.sh b/tools/ci/jobs/clang33.sh
index 12c1107e4..3e788a934 100755
--- a/tools/ci/jobs/clang33.sh
+++ b/tools/ci/jobs/clang33.sh
@@ -14,7 +14,7 @@ export LOGFILE=clang33.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-stdlib=libc++"
+export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang34.sh b/tools/ci/jobs/clang34.sh
index 61f5e362f..47309f8f1 100755
--- a/tools/ci/jobs/clang34.sh
+++ b/tools/ci/jobs/clang34.sh
@@ -14,7 +14,7 @@ export LOGFILE=clang34.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-stdlib=libc++"
+export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang35.sh b/tools/ci/jobs/clang35.sh
index 382a7c728..29e49e253 100755
--- a/tools/ci/jobs/clang35.sh
+++ b/tools/ci/jobs/clang35.sh
@@ -14,7 +14,7 @@ export LOGFILE=clang35.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-stdlib=libc++"
+export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang36.sh b/tools/ci/jobs/clang36.sh
index 1b6425dd7..176cf9c9b 100755
--- a/tools/ci/jobs/clang36.sh
+++ b/tools/ci/jobs/clang36.sh
@@ -14,7 +14,7 @@ export LOGFILE=clang36.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-stdlib=libc++"
+export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang37.sh b/tools/ci/jobs/clang37.sh
index 0f19711ee..b60e50949 100755
--- a/tools/ci/jobs/clang37.sh
+++ b/tools/ci/jobs/clang37.sh
@@ -14,7 +14,7 @@ export LOGFILE=clang37.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-stdlib=libc++"
+export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang38.sh b/tools/ci/jobs/clang38.sh
index 426b41f66..053ead9ec 100755
--- a/tools/ci/jobs/clang38.sh
+++ b/tools/ci/jobs/clang38.sh
@@ -14,14 +14,14 @@ export LOGFILE=clang38.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
+export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
 -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
 -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
 -Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
--Wpointer-bool-conversion"
+-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh
index ed273083a..641f03afa 100755
--- a/tools/ci/jobs/clang39.sh
+++ b/tools/ci/jobs/clang39.sh
@@ -14,14 +14,14 @@ export LOGFILE=clang39.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
+export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
 -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
 -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
 -Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
--Wpointer-bool-conversion"
+-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang39.sh_c++11.sh b/tools/ci/jobs/clang39.sh_c++11.sh
index e703c8db5..88d89f732 100755
--- a/tools/ci/jobs/clang39.sh_c++11.sh
+++ b/tools/ci/jobs/clang39.sh_c++11.sh
@@ -14,7 +14,7 @@ export LOGFILE=clang39.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
+export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
@@ -22,7 +22,7 @@ export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversio
 -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
 -Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
 -Wpointer-bool-conversion \
--O3 -std=c++11 -Wno-c++98-compat-pedantic"
+-O3 -std=c++11 -Wno-c++98-compat-pedantic -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh
index a5e05a88a..64e37c73e 100755
--- a/tools/ci/jobs/clang39_sdl2.sh
+++ b/tools/ci/jobs/clang39_sdl2.sh
@@ -14,14 +14,14 @@ export LOGFILE=clang39.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
+export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
 -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
 -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
 -Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
--Wpointer-bool-conversion"
+-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror --with-sdl2 $*
diff --git a/tools/ci/jobs/clang40.sh b/tools/ci/jobs/clang40.sh
index bc6fc1bd5..76c558c45 100755
--- a/tools/ci/jobs/clang40.sh
+++ b/tools/ci/jobs/clang40.sh
@@ -14,14 +14,14 @@ export LOGFILE=clang40.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
+export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
 -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
 -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
 -Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
--Wpointer-bool-conversion"
+-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/cmake_gcc49.sh b/tools/ci/jobs/cmake_gcc49.sh
index 431a4c11f..00f624029 100755
--- a/tools/ci/jobs/cmake_gcc49.sh
+++ b/tools/ci/jobs/cmake_gcc49.sh
@@ -14,6 +14,8 @@ export LOGFILE=cmake_gcc49.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_cmake
 run_make
diff --git a/tools/ci/jobs/gcc3.sh b/tools/ci/jobs/gcc3.sh
index 41e53a30e..9e12b5f0f 100755
--- a/tools/ci/jobs/gcc3.sh
+++ b/tools/ci/jobs/gcc3.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc3.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure $*
 run_make
diff --git a/tools/ci/jobs/gcc41.sh b/tools/ci/jobs/gcc41.sh
index 545cd898c..26b2add46 100755
--- a/tools/ci/jobs/gcc41.sh
+++ b/tools/ci/jobs/gcc41.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc41.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure $*
 run_make
diff --git a/tools/ci/jobs/gcc43.sh b/tools/ci/jobs/gcc43.sh
index dd6f3c381..1f528b9ba 100755
--- a/tools/ci/jobs/gcc43.sh
+++ b/tools/ci/jobs/gcc43.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc43.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure $*
 run_make
diff --git a/tools/ci/jobs/gcc44.sh b/tools/ci/jobs/gcc44.sh
index c831963d7..eb71d9e93 100755
--- a/tools/ci/jobs/gcc44.sh
+++ b/tools/ci/jobs/gcc44.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc44.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/gcc45.sh b/tools/ci/jobs/gcc45.sh
index 918116d62..f859d42fb 100755
--- a/tools/ci/jobs/gcc45.sh
+++ b/tools/ci/jobs/gcc45.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc45.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/gcc46.sh b/tools/ci/jobs/gcc46.sh
index db845a606..f5880b0fb 100755
--- a/tools/ci/jobs/gcc46.sh
+++ b/tools/ci/jobs/gcc46.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc46.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/gcc47.sh b/tools/ci/jobs/gcc47.sh
index cfdb493d7..bd11ac5b2 100755
--- a/tools/ci/jobs/gcc47.sh
+++ b/tools/ci/jobs/gcc47.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc47.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/gcc47_c++11.sh b/tools/ci/jobs/gcc47_c++11.sh
index 92e102466..dc152e2b8 100755
--- a/tools/ci/jobs/gcc47_c++11.sh
+++ b/tools/ci/jobs/gcc47_c++11.sh
@@ -14,9 +14,10 @@ export LOGFILE=gcc47.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -funswitch-loops \
--std=c++0x"
+-std=c++0x \
+-fno-omit-frame-pointer $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/gcc48.sh b/tools/ci/jobs/gcc48.sh
index 018524b5a..6535462ca 100755
--- a/tools/ci/jobs/gcc48.sh
+++ b/tools/ci/jobs/gcc48.sh
@@ -14,6 +14,8 @@ export LOGFILE=gcc47.log
 
 source ./tools/ci/scripts/init.sh
 
+export CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/gcc48_c++11.sh b/tools/ci/jobs/gcc48_c++11.sh
index c1499e77f..d441c49cc 100755
--- a/tools/ci/jobs/gcc48_c++11.sh
+++ b/tools/ci/jobs/gcc48_c++11.sh
@@ -14,8 +14,9 @@ export LOGFILE=gcc48_c++11.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -funswitch-loops \
+-fno-omit-frame-pointer \
 -Wvariadic-macros -Wvla -Wredundant-decls \
 -Wpacked-bitfield-compat -Wtrampolines \
 -Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \
@@ -40,7 +41,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wsuggest-attribute=format -Wtype-limits -Wuninitialized \
 -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \
 -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable \
--Wno-attributes"
+-Wno-attributes $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/gcc49.sh b/tools/ci/jobs/gcc49.sh
index 893cecf8c..a0f2fa315 100755
--- a/tools/ci/jobs/gcc49.sh
+++ b/tools/ci/jobs/gcc49.sh
@@ -14,7 +14,7 @@ export LOGFILE=gcc49.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-fno-var-tracking"
+export CXXFLAGS="$CXXFLAGS -fno-var-tracking -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/gcc49_c++11.sh b/tools/ci/jobs/gcc49_c++11.sh
index caa8b1899..561f108f3 100755
--- a/tools/ci/jobs/gcc49_c++11.sh
+++ b/tools/ci/jobs/gcc49_c++11.sh
@@ -14,7 +14,7 @@ export LOGFILE=gcc49_c++11.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -funswitch-loops \
 -Wvariadic-macros -Wvla -Wredundant-decls \
 -Wpacked-bitfield-compat -Wtrampolines \
@@ -41,7 +41,8 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \
 -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable \
 -fno-var-tracking -Wno-attributes \
--Woverloaded-virtual"
+-Woverloaded-virtual \
+-fno-omit-frame-pointer $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/gcc5.sh b/tools/ci/jobs/gcc5.sh
index 05aa51e5a..2b0ae98e1 100755
--- a/tools/ci/jobs/gcc5.sh
+++ b/tools/ci/jobs/gcc5.sh
@@ -14,7 +14,7 @@ export LOGFILE=gcc5.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -fno-omit-frame-pointer -funswitch-loops \
 -Wvariadic-macros -Wvla -Wredundant-decls \
 -Wpacked-bitfield-compat -Wtrampolines \
@@ -46,7 +46,8 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wopenmp-simd -Wformat-signedness \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wsized-deallocation \
 -Wlogical-not-parentheses -Woverloaded-virtual \
--Wno-variadic-macros -Wno-zero-as-null-pointer-constant"
+-Wno-variadic-macros -Wno-zero-as-null-pointer-constant \
+$POST_CXXFLAGS"
 
 do_init
 run_configure $*
diff --git a/tools/ci/jobs/gcc5_c++11.sh b/tools/ci/jobs/gcc5_c++11.sh
index d52a54006..2340109bb 100755
--- a/tools/ci/jobs/gcc5_c++11.sh
+++ b/tools/ci/jobs/gcc5_c++11.sh
@@ -14,7 +14,7 @@ export LOGFILE=gcc5.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -fno-omit-frame-pointer -funswitch-loops \
 -Wvariadic-macros -Wvla -Wredundant-decls \
 -Wpacked-bitfield-compat -Wtrampolines \
@@ -45,7 +45,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -fno-var-tracking -Wno-attributes \
 -Wopenmp-simd -Wformat-signedness \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
--Wlogical-not-parentheses -Woverloaded-virtual"
+-Wlogical-not-parentheses -Woverloaded-virtual $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/gcc5_sanitize.sh b/tools/ci/jobs/gcc5_sanitize.sh
index 4d70578bb..bfbbf75ce 100755
--- a/tools/ci/jobs/gcc5_sanitize.sh
+++ b/tools/ci/jobs/gcc5_sanitize.sh
@@ -14,7 +14,7 @@ export LOGFILE=gcc5_sanitize.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -fsanitize=address -fsanitize=undefined \
 -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable \
 -fsanitize=vla-bound -fsanitize=null -fsanitize=return \
@@ -55,7 +55,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Woverloaded-virtual -Warray-bounds -Wbool-compare -Wchar-subscripts \
 -Wcomment -Wmissing-braces -Wnonnull -Wopenmp-simd -Wparentheses \
 -Wreturn-type -Wsequence-point -Wswitch \
--Wno-attributes"
+-Wno-attributes $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror $*
diff --git a/tools/ci/jobs/gcc5_sdl2.sh b/tools/ci/jobs/gcc5_sdl2.sh
index fd9f8a825..0ee213a57 100755
--- a/tools/ci/jobs/gcc5_sdl2.sh
+++ b/tools/ci/jobs/gcc5_sdl2.sh
@@ -15,7 +15,7 @@ export LOGFILE=gcc5_sdl2.log
 source ./tools/ci/scripts/init.sh
 
 # need fix -Woverloaded-virtual
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -fno-omit-frame-pointer -funswitch-loops \
 -Wvariadic-macros -Wvla -Wredundant-decls \
 -Wpacked-bitfield-compat -Wtrampolines \
@@ -47,7 +47,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wopenmp-simd -Wformat-signedness \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wsized-deallocation \
 -Wlogical-not-parentheses \
--Wno-variadic-macros -Wno-zero-as-null-pointer-constant"
+-Wno-variadic-macros -Wno-zero-as-null-pointer-constant $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror --with-sdl2 $*
diff --git a/tools/ci/jobs/gcc5_sdl2_c++11.sh b/tools/ci/jobs/gcc5_sdl2_c++11.sh
index 8e03eea08..5304249b3 100755
--- a/tools/ci/jobs/gcc5_sdl2_c++11.sh
+++ b/tools/ci/jobs/gcc5_sdl2_c++11.sh
@@ -15,7 +15,7 @@ export LOGFILE=gcc5_sdl2.log
 source ./tools/ci/scripts/init.sh
 
 # need fix -Woverloaded-virtual
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -fno-omit-frame-pointer -funswitch-loops \
 -Wvariadic-macros -Wvla -Wredundant-decls \
 -Wpacked-bitfield-compat -Wtrampolines \
@@ -46,7 +46,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -fno-var-tracking -Wno-attributes \
 -Wopenmp-simd -Wformat-signedness \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
--Wlogical-not-parentheses"
+-Wlogical-not-parentheses $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror --with-sdl2 $*
diff --git a/tools/ci/jobs/gcc5_tarball.sh b/tools/ci/jobs/gcc5_tarball.sh
index def5ff368..485ee99ef 100755
--- a/tools/ci/jobs/gcc5_tarball.sh
+++ b/tools/ci/jobs/gcc5_tarball.sh
@@ -14,7 +14,7 @@ export LOGFILE=gcc5_tarball.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
 -fno-omit-frame-pointer -funswitch-loops \
 -Wvariadic-macros -Wvla -Wredundant-decls \
 -Wpacked-bitfield-compat -Wtrampolines \
@@ -45,7 +45,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -fno-var-tracking -Wno-attributes \
 -Wopenmp-simd -Wformat-signedness \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
--Wlogical-not-parentheses -Woverloaded-virtual"
+-Wlogical-not-parentheses -Woverloaded-virtual $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-werror
diff --git a/tools/ci/jobs/gcc6.sh b/tools/ci/jobs/gcc6.sh
index 9a2724085..1ef860994 100755
--- a/tools/ci/jobs/gcc6.sh
+++ b/tools/ci/jobs/gcc6.sh
@@ -17,7 +17,7 @@ source ./tools/ci/scripts/init.sh
 export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
--Wno-attributes"
+-Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc6.sh
 
diff --git a/tools/ci/jobs/gcc6_lto.sh b/tools/ci/jobs/gcc6_lto.sh
index 5488715f3..247c4d57f 100755
--- a/tools/ci/jobs/gcc6_lto.sh
+++ b/tools/ci/jobs/gcc6_lto.sh
@@ -14,12 +14,14 @@ export LOGFILE=gcc6.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-ggdb3 -pipe -ffast-math -O9 -flto -fwhole-program \
+export CXXFLAGS="$CXXFLAGS -ggdb3 -pipe -ffast-math -O9 -flto -fwhole-program \
 -fno-omit-frame-pointer -funswitch-loops -D_FORTIFY_SOURCE=2 -std=gnu++1z \
--Wno-attributes"
+-Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/gcc6_sanitize.sh b/tools/ci/jobs/gcc6_sanitize.sh
index c03f7d324..db805c2e6 100755
--- a/tools/ci/jobs/gcc6_sanitize.sh
+++ b/tools/ci/jobs/gcc6_sanitize.sh
@@ -14,7 +14,7 @@ export LOGFILE=gcc6.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -fsanitize=address -fsanitize=undefined \
 -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable \
@@ -24,7 +24,7 @@ export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -fsanitize=nonnull-attribute -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-strict \
 -std=gnu++1z -Wformat=1 \
--Wno-attributes"
+-Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc6.sh
 
diff --git a/tools/ci/jobs/gcc6_sanitize_tests.sh b/tools/ci/jobs/gcc6_sanitize_tests.sh
index 789526833..c451ed0d6 100755
--- a/tools/ci/jobs/gcc6_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc6_sanitize_tests.sh
@@ -29,6 +29,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gcc6_sdl2_tests.sh b/tools/ci/jobs/gcc6_sdl2_tests.sh
index 0274e77ac..cd02e5cc4 100755
--- a/tools/ci/jobs/gcc6_sdl2_tests.sh
+++ b/tools/ci/jobs/gcc6_sdl2_tests.sh
@@ -14,13 +14,15 @@ export LOGFILE=gcc6.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes --with-sdl2 $*
 export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh
index e121dc73a..0d5f02f91 100755
--- a/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh
+++ b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh
@@ -14,13 +14,15 @@ export LOGFILE=gcc6.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes --with-sdl2 --with-gcov $*
 export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gcc6_silent.sh b/tools/ci/jobs/gcc6_silent.sh
index aa4c10fdd..2453c2bdc 100755
--- a/tools/ci/jobs/gcc6_silent.sh
+++ b/tools/ci/jobs/gcc6_silent.sh
@@ -17,7 +17,7 @@ source ./tools/ci/scripts/init.sh
 export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
--Wno-attributes"
+-Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc6.sh
 
diff --git a/tools/ci/jobs/gcc6_tarball_tests.sh b/tools/ci/jobs/gcc6_tarball_tests.sh
index 149edee92..bb0bb78ac 100755
--- a/tools/ci/jobs/gcc6_tarball_tests.sh
+++ b/tools/ci/jobs/gcc6_tarball_tests.sh
@@ -14,13 +14,15 @@ export LOGFILE=gcc6_tarballtests.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes $*
 run_tarball test
diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh
index 48dd282c3..6b42c060a 100755
--- a/tools/ci/jobs/gcc6_tests.sh
+++ b/tools/ci/jobs/gcc6_tests.sh
@@ -21,6 +21,8 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gcc6_tests_gcov.sh b/tools/ci/jobs/gcc6_tests_gcov.sh
index 50e83fb99..479a7ca21 100755
--- a/tools/ci/jobs/gcc6_tests_gcov.sh
+++ b/tools/ci/jobs/gcc6_tests_gcov.sh
@@ -14,13 +14,15 @@ export LOGFILE=gcc6.log
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes --with-gcov $*
 export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gcc6_tests_simd.sh b/tools/ci/jobs/gcc6_tests_simd.sh
index 77b639e61..04f7d007e 100755
--- a/tools/ci/jobs/gcc6_tests_simd.sh
+++ b/tools/ci/jobs/gcc6_tests_simd.sh
@@ -16,7 +16,7 @@ source ./tools/ci/scripts/init.sh
 
 # remove -flto -fwhole-program because gcc bug with lto + target attribute
 
-export CXXFLAGS="-pedantic -ggdb3 -O5 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O5 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -ffast-math -funswitch-loops \
 -funsafe-loop-optimizations \
@@ -26,6 +26,8 @@ export CXXFLAGS="-pedantic -ggdb3 -O5 -pipe -Wstrict-aliasing=2 \
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh
index 26eb5e88e..b9b677fd8 100755
--- a/tools/ci/jobs/gccsnapshot.sh
+++ b/tools/ci/jobs/gccsnapshot.sh
@@ -15,13 +15,15 @@ export PATH=/usr/lib/gcc-snapshot/bin:$PATH
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
--Wno-attributes"
+-Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gccsnapshot.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror $*
 run_make
diff --git a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
index a3ac1a365..7568d455e 100755
--- a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
+++ b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
@@ -15,7 +15,7 @@ export PATH=/usr/lib/gcc-snapshot/bin:$PATH
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -fno-omit-frame-pointer \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -fsanitize=address -fsanitize=undefined \
@@ -30,6 +30,8 @@ export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy
diff --git a/tools/ci/jobs/gccsnapshot_sdl2.sh b/tools/ci/jobs/gccsnapshot_sdl2.sh
index f6c53998e..6a5cc68bb 100755
--- a/tools/ci/jobs/gccsnapshot_sdl2.sh
+++ b/tools/ci/jobs/gccsnapshot_sdl2.sh
@@ -15,13 +15,15 @@ export PATH=/usr/lib/gcc-snapshot/bin:$PATH
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
--Wno-attributes"
+-Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gccsnapshot.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-werror --with-sdl2 $*
 run_make
diff --git a/tools/ci/jobs/gccsnapshot_tests.sh b/tools/ci/jobs/gccsnapshot_tests.sh
index cfce93c32..7105356c9 100755
--- a/tools/ci/jobs/gccsnapshot_tests.sh
+++ b/tools/ci/jobs/gccsnapshot_tests.sh
@@ -15,13 +15,15 @@ export PATH=/usr/lib/gcc-snapshot/bin:$PATH
 
 source ./tools/ci/scripts/init.sh
 
-export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
 -std=gnu++1z -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc6.sh
 
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy