summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-03 17:57:19 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-04 03:37:07 +0300
commit44fd594631f0d4ae437c4e504d74940b58cc445e (patch)
tree38f5a690a48b7b7c74abf1d5c0c694f132ba59ef
parent70c29540a3842db2fa5507b026030e58139f2465 (diff)
downloadmv-44fd594631f0d4ae437c4e504d74940b58cc445e.tar.gz
mv-44fd594631f0d4ae437c4e504d74940b58cc445e.tar.bz2
mv-44fd594631f0d4ae437c4e504d74940b58cc445e.tar.xz
mv-44fd594631f0d4ae437c4e504d74940b58cc445e.zip
Dont remove existing CPPFLAGS in gcc6.sh and gcc6_tests.sh script.
-rwxr-xr-xtools/ci/jobs/gcc6.sh2
-rwxr-xr-xtools/ci/jobs/gcc6_tests.sh2
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"