From 7e7c5478fbda652e2c2c8adaae62e11aed12d78b Mon Sep 17 00:00:00 2001
From: Fred Wright <fw@fwright.net>
Date: Thu, 2 Nov 2017 14:35:59 -0700
Subject: Fixes broken Travis clang++ workaround.

Commit 66df9308 disabled C++ builds on Travis when using clang++, in
order to get around an unresolved issue with __float128.  Hovever,
commit 2f6e5b67 broke the workround by adding an explicit qt=yes to
SCONSOPTS.  This wasn't immediately noticed, since that commit also
broke the use of Qt4 altogether, and there is no case that builds with
Qt5 and clang++.  Fixing the Qt4 bug in commit 2c01c135 then
reintroduced the old clang++ bug.

This change removes the troublesome explicit qt=yes.

TESTED:
Will be once this change is pushed and picked up by Travis.  It has no
effect outside Travis.
---
 .travis/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis/build.sh')

diff --git a/.travis/build.sh b/.travis/build.sh
index 32663029..40b672f2 100644
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -17,7 +17,7 @@ SCONSOPTS="${SCONSOPTS} libdir=/usr/lib/${DEB_HOST_MULTIARCH}"
 SCONSOPTS="${SCONSOPTS} gpsd_user=gpsd"
 SCONSOPTS="${SCONSOPTS} gpsd_group=dialout"
 SCONSOPTS="${SCONSOPTS} debug=yes"
-SCONSOPTS="${SCONSOPTS} qt=yes"
+### SCONSOPTS="${SCONSOPTS} qt=yes"  # The default qt=yes must be overridable
 
 if dpkg -s qtbase5-dev 1>/dev/null 2>&1; then
     SCONSOPTS="${SCONSOPTS} qt_versioned=5"
-- 
cgit v1.2.1