From e45eaf6e3085fd5e51907cff1b93d747620ffc00 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Wed, 23 Aug 2017 08:39:19 +0200
Subject: [PATCH] Revert ":construction_worker: using libc++ with Clang"

This reverts commit 41b2c69bdb72268638472f46bd996f98919e06e2.
---
 .travis.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1133b8c847..b59b7a5157 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
-        packages: ['clang-5.0', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-5.0']
     after_success:
       - make clang_sanitize -j4
 
@@ -119,7 +119,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
-        packages: ['clang-3.6', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-3.6']
       coverity_scan:
         project:
           name: "nlohmann/json"
@@ -207,7 +207,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5']
-        packages: ['clang-3.5', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-3.5']
 
   - os: linux
     compiler: clang
@@ -215,7 +215,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
-        packages: ['clang-3.6', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-3.6']
 
   - os: linux
     compiler: clang
@@ -223,7 +223,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
-        packages: ['clang-3.7', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-3.7']
 
   - os: linux
     compiler: clang
@@ -231,7 +231,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test']
-        packages: ['clang-3.8', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-3.8']
 
   - os: linux
     compiler: clang
@@ -239,7 +239,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test']
-        packages: ['clang-3.9', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-3.9']
 
   - os: linux
     compiler: clang
@@ -247,7 +247,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
-        packages: ['clang-4.0', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-4.0']
 
   - os: linux
     compiler: clang
@@ -255,7 +255,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
-        packages: ['clang-5.0', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-5.0']
 
   - os: linux
     compiler: clang
@@ -265,7 +265,7 @@ matrix:
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
-        packages: ['clang-5.0', 'libc++-dev', 'libc++abi-dev']
+        packages: ['g++-6', 'clang-5.0']
 
 ################
 # build script #