AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass -Werror on make command line

Browse Source 
Setting CXXFLAGS=-Werror in the environment wasn't enough, it was still
overridden by the empty CXXFLAGS in the makefile.

Ideal would be to get rid of the empty flags there, but for now override
them on make command line explicitly.
This commit is contained in:
Vadim Zeitlin 2020-07-06 15:36:41 +02:00
parent c4152869f5
commit 437b8eebec
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/tools/travis-ci.sh
View File

@ -67,7 +67,11 @@ case $wxTOOLSET in
fi
echo 'travis_fold:end:configure'
[ "$wxALLOW_WARNINGS" = 1 ] || export CXXFLAGS='-Werror -Wno-error=cpp'
if [ "$wxALLOW_WARNINGS" != 1 ]; then
error_opts="-Werror -Wno-error=cpp"
wxMAKEFILE_CXXFLAGS="$wxMAKEFILE_CXXFLAGS $error_opts"
wxMAKEFILE_ERROR_CXXFLAGS="CXXFLAGS=$error_opts"
fi
if [ -n "$wxMAKEFILE_CXXFLAGS" ]; then
wxMAKEFILE_FLAGS="CXXFLAGS=$wxMAKEFILE_CXXFLAGS"
@ -78,7 +82,7 @@ case $wxTOOLSET in
echo 'travis_fold:start:building'
echo 'Building...'
make -k $wxBUILD_ARGS
make -k $wxBUILD_ARGS $wxMAKEFILE_ERROR_CXXFLAGS
echo 'travis_fold:end:building'
echo 'travis_fold:start:tests'