[travis] Travis lies about cpu type which causes -march builds to fail.

Change the build matrix.

References #3967

git-svn-id: http://svn.osgeo.org/postgis/trunk@16216 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/.travis.yml b/.travis.yml
index 8434d6c3e5af3df442bb5f3a88c49e0a3c8f5c0e..4bc4d6acd0e881ad96fe0e3d6b5a4a6215e715a4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,9 @@ env:
   global:
     - RUNTESTFLAGS=-v
   matrix:
-    - CFLAGS="-O3 -march=native -mtune=native"
-    - CFLAGS="-O3 -march=native -mtune=native -fno-omit-frame-pointer -Werror"
+    - CFLAGS="-Og"
+    - CFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro"
+    - CFLAGS="-O3 -mtune=generic -fno-omit-frame-pointer -Werror"
     - CFLAGS="-O0 --coverage -fprofile-arcs -ftest-coverage" LDFLAGS="--coverage -fprofile-arcs -ftest-coverage"
 
 addons:
@@ -43,6 +44,7 @@ before_install:
 
 after_failure:
   - sudo head -n1000 /var/log/postgresql/postgresql-9.6-main.log 
+  - cat /proc/cpuinfo
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)