From 059be38b90579619fa9b4dd67f94093b4bdebb10 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Jul 2018 11:06:17 -0300 Subject: Add hercules only compiled flags for disable some warnings in gcc-7 and gcc-8 (PS. Moubootaur legends use gcc-4.9 so this is mostly for support. ~ Jesusalva) --- .gitlab-ci.yml | 1 + .tools/scripts/init.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4999d3fa0..982d03633 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,6 +135,7 @@ mariadb_run_latest: stage: test script: - export CC=gcc-4.9 + - export HERCCPPFLAGS=" -Wno-format-overflow" - ./.tools/jobs/install.sh "mysql-client gcc-4.9 git-core diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index 2e9b84175..38818f384 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -117,8 +117,8 @@ function make_server { echo "autoreconf -i" autoreconf -i check_error $? - echo ./configure $1 CPPFLAGS=\"${CPPFLAGS}\" - ./configure $1 CPPFLAGS="$CPPFLAGS" + echo ./configure $1 CPPFLAGS=\"${CPPFLAGS}${HERCCPPFLAGS}\" + ./configure $1 CPPFLAGS="$CPPFLAGS$HERCCPPFLAGS" export err="$?" if [ "$err" != 0 ]; then echo "Error $err" -- cgit v1.2.3-70-g09d2