diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-07-09 05:34:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-07-09 07:20:45 +0300 |
| commit | ea55712b0feb06f74710f9f9f90cc99f05624b91 (patch) | |
| tree | 0197f9852ae27c08c0f2b435beccde241abe262f | |
| parent | b54d83677231e734f94c3ba5e28a185b2bbed0e6 (diff) | |
| download | serverdata-ea55712b0feb06f74710f9f9f90cc99f05624b91.tar.gz serverdata-ea55712b0feb06f74710f9f9f90cc99f05624b91.tar.bz2 serverdata-ea55712b0feb06f74710f9f9f90cc99f05624b91.tar.xz serverdata-ea55712b0feb06f74710f9f9f90cc99f05624b91.zip | |
Add hercules only compiled flags for disable some warnings in gcc-7 and gcc-8.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .tools/scripts/init.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e535b19..0e5c0bc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -241,6 +241,7 @@ mariadb_run_latest_gcc7: stage: test script: - export CC=gcc-7 + - export HERCCPPFLAGS=" -Wno-format-overflow" - ./.tools/jobs/install.sh "mysql-client gcc-7 git-core @@ -262,6 +263,7 @@ mariadb_run_latest_gcc8: stage: test script: - export CC=gcc-8 + - export HERCCPPFLAGS=" -Wno-format-overflow" - ./.tools/jobs/install.sh "mysql-client gcc-8 git-core diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index 4cc644e3..9bac358e 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -119,8 +119,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" |