From 9732acce78d025477b75e576bf29ec38a59c3a45 Mon Sep 17 00:00:00 2001
From: Mathieu Champlon <mathieu.champlon@masagroup.net>
Date: Fri, 19 Jan 2018 09:17:35 +0100
Subject: [PATCH] Fixed travis cxxflags

---
 .travis.yml    |  6 ++----
 build/build.sh | 44 ++++++++++++++++++--------------------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5064883..bef489d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,12 +54,10 @@ before_install:
     - ./b2 headers
 
 script:
-    - if [ "$CCFLAGS" != "" ]; then FLAGS="cxxflags=\"$CCFLAGS\" linkflags=\"$LINKFLAGS\""; else FLAGS=""; fi
     - cd $PROJECT_DIR/build
-    # `--coverage` flags required to generate coverage info for Coveralls
-    # ../../../b2 -q cxxflags="--coverage -std=$CXX_STANDARD" linkflags="--coverage"
     - export BOOST_ROOT=$BOOST
-    - ./build.sh cxxflags="--coverage -std=$CXX_STANDARD" linkflags="--coverage"
+    # `--coverage` flags required to generate coverage info for Coveralls
+    - ./build.sh "cxxflags=-std=$CXX_STANDARD --coverage" "linkflags=--coverage"
 
 after_success:
     - COVERALS_DIR=$PROJECT_DIR/coverals
diff --git a/build/build.sh b/build/build.sh
index 3683544..7791769 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -5,36 +5,28 @@
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
-run()
-{
-    echo $@
-    $@
-    r=$?
-    if test $r -ne 0 ; then
-        exit $r
-    fi
-}
-
 copy()
 {
     for dir; do true; done
-    run mkdir -p $dir
-    run cp $@
+    mkdir -p $dir
+    cp $@
 }
 
-run export BOOST=$BOOST_ROOT
+set -x
 
-run cd ../test
-run $BOOST/b2 -q "$@"
-run cd ../build
+export BOOST=$BOOST_ROOT
 
-run export BOOSTBOOK_DIR=../bin/turtle/boostbook
-run copy -r "$BOOST"/tools/boostbook/xsl $BOOSTBOOK_DIR
-run copy -r "$BOOST"/tools/boostbook/dtd $BOOSTBOOK_DIR
-run copy -r boostbook/* $BOOSTBOOK_DIR
-run copy "$BOOST"/doc/src/boostbook.css ../doc/html
-run copy "$BOOST"/doc/src/images/*.png ../doc/html/images
-run copy "$BOOST"/doc/src/images/callouts/*.png ../doc/html/images/callouts
-run cd ../doc
-run $BOOST/b2 -q "$@"
-run cd ../build
+cd ../test
+$BOOST/b2 -q "$@"
+cd ../build
+
+export BOOSTBOOK_DIR=../bin/turtle/boostbook
+copy -r "$BOOST"/tools/boostbook/xsl $BOOSTBOOK_DIR
+copy -r "$BOOST"/tools/boostbook/dtd $BOOSTBOOK_DIR
+copy -r boostbook/* $BOOSTBOOK_DIR
+copy "$BOOST"/doc/src/boostbook.css ../doc/html
+copy "$BOOST"/doc/src/images/*.png ../doc/html/images
+copy "$BOOST"/doc/src/images/callouts/*.png ../doc/html/images/callouts
+cd ../doc
+$BOOST/b2 -q "$C"
+cd ../build