travis: move CHECK_INTERNAL check up, remove "SRCDIR=build VERIFY=1" job in favor of "MAKEFLAGS="HAVE_RULES=yes" SRCDIR=build VERIFY=1"

Conflicts:
	.travis.yml
This commit is contained in:
Matthias Krüger 2014-05-27 21:27:10 +02:00
parent 1900e7b25f
commit 94c6fa1083
1 changed files with 2 additions and 3 deletions

View File

@ -10,10 +10,9 @@ env:
# this also turns off the debug/warning cxxflags # this also turns off the debug/warning cxxflags
- CXXFLAGS="-O2 -Wunreachable-code" - CXXFLAGS="-O2 -Wunreachable-code"
matrix: matrix:
# special CXXFLAGS for maximum speed, overrides global CXXFLAGS, CHECK_KERNEL is the var that controls if we download and check the kernel 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
- MAKEFLAGS="HAVE_RULES=yes" SRCDIR=build VERIFY=1
- SRCDIR=build VERIFY=1
- CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL" - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL"
- MAKEFLAGS="HAVE_RULES=yes" SRCDIR=build VERIFY=1
- CXXFLAGS="-O3 -march=native -mtune=native" SRCDIR=build CHECK_KERNEL=yes - CXXFLAGS="-O3 -march=native -mtune=native" SRCDIR=build CHECK_KERNEL=yes
matrix: matrix: