From 64fc25c2403218d642388815b76160d7104f3d79 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Thu, 28 Sep 2017 15:10:30 +0200
Subject: [PATCH] travis-ci: consolidate travis configuration

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 735e00c..575951f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,10 @@ script:
 env:
  - BRCORE=master BRLIBCOM=master BRPVD=master BRPVA=master BRNT=master TEST=NO
  - CMPLR=clang TEST=NO
- - EXTRA="CMD_CXXFLAGS=-std=c++11" TEST=NO
- - CMPLR=clang EXTRA="CMD_CXXFLAGS=-std=c++11" TEST=NO
- - WINE=32 TEST=NO STATIC=YES TEST=NO
- - WINE=32 TEST=NO STATIC=NO TEST=NO
+ - USR_CXXFLAGS=-std=c++11 TEST=NO
+ - CMPLR=clang USR_CXXFLAGS=-std=c++11 TEST=NO
+ - WINE=32 TEST=NO STATIC=YES
+ - WINE=32 TEST=NO STATIC=NO
  - RTEMS=4.10 TEST=NO
  - RTEMS=4.9 TEST=NO
  - BRBASE=3.16 TEST=NO