travis: reenable original CXXFLAGS

This commit is contained in:
Matthias Krüger 2016-12-05 23:18:50 +01:00
parent 6dfbddef43
commit 0b3fe1807b
1 changed files with 2 additions and 1 deletions

View File

@ -8,7 +8,8 @@ env:
global: global:
# unfortunately we need this to stay within 50min timelimit given by travis. # unfortunately we need this to stay within 50min timelimit given by travis.
# this also turns off the debug/warning cxxflags # this also turns off the debug/warning cxxflags
- CXXFLAGS="-O2 -march=native -mtune=native -Wunreachable-code" - ORIGINAL_CXXFLAGS="-include lib/cxx11emu.h -pedantic -Wall -Wextra -Wabi -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wshadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar -D_GLIBCXX_DEBUG -g "
- CXXFLAGS="${ORIGINAL_CXXFLAGS} -O2 -march=native"
matrix: matrix:
# special CXXFLAGS for maximum speed, overrides global CXXFLAGS, CHECK_CLANG is the var that controls if we download and check clang in that travis job # special CXXFLAGS for maximum speed, overrides global CXXFLAGS, CHECK_CLANG is the var that controls if we download and check clang in that travis job
- CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL" - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL"