diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-03 17:57:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-04 03:37:07 +0300 |
| commit | 44fd594631f0d4ae437c4e504d74940b58cc445e (patch) | |
| tree | 38f5a690a48b7b7c74abf1d5c0c694f132ba59ef | |
| parent | 70c29540a3842db2fa5507b026030e58139f2465 (diff) | |
| download | manaplus-44fd594631f0d4ae437c4e504d74940b58cc445e.tar.gz manaplus-44fd594631f0d4ae437c4e504d74940b58cc445e.tar.bz2 manaplus-44fd594631f0d4ae437c4e504d74940b58cc445e.tar.xz manaplus-44fd594631f0d4ae437c4e504d74940b58cc445e.zip | |
Dont remove existing CPPFLAGS in gcc6.sh and gcc6_tests.sh script.
| -rwxr-xr-x | tools/ci/jobs/gcc6.sh | 2 | ||||
| -rwxr-xr-x | tools/ci/jobs/gcc6_tests.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/ci/jobs/gcc6.sh b/tools/ci/jobs/gcc6.sh index c358b0e44..53095c308 100755 --- a/tools/ci/jobs/gcc6.sh +++ b/tools/ci/jobs/gcc6.sh @@ -6,7 +6,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 \ -std=gnu++1z -Wformat=1 \ -Wno-attributes" diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh index 62b647578..c071143e8 100755 --- a/tools/ci/jobs/gcc6_tests.sh +++ b/tools/ci/jobs/gcc6_tests.sh @@ -6,7 +6,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 \ -std=gnu++1z -Wformat=1 \ -Wno-attributes" |