From 2b8698d6e200b10faf25fd713474816ce30a20e5 Mon Sep 17 00:00:00 2001
From: "Dr. Chat" <arkolbed@gmail.com>
Date: Sun, 5 Feb 2017 20:21:35 -0600
Subject: [PATCH] Try and re-enable travis builds

---
 .travis.yml  | 21 +++++++++++----------
 premake5.lua |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1edd9aa15..91bf455c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,22 +23,22 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      # - llvm-toolchain-precise
+      - llvm-toolchain-precise
     packages:
-      # - clang-3.8
-      # - clang-format-3.8
+      - clang-3.8
+      - clang-format-3.8
+      - libc++-dev
 
 git:
   # We handle submodules ourselves in xenia-build setup.
   submodules: false
 
 before_install:
-  - wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
-  - mkdir $HOME/clang+llvm
-  - tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang+llvm --strip-components 1
-  - export PATH=$HOME/clang+llvm/bin:$PATH
+  # Nothing!
 
 before_script:
+  - export CXX=clang++-3.8
+  - export CC=clang-3.8
   # Dump useful info.
   - $CXX --version
   # Prepare environment (pull dependencies, build tools).
@@ -49,10 +49,11 @@ script:
   - ./xenia-build lint --all
   # Run style checker.
   #- ./xenia-build style
-  # TODO(DrChat): Enable builds in the future.
   # Build and run our simple hello world test.
-  # - ./xenia-build build --config=debug --target=xenia-base-tests
-  # - ./build/bin/Linux/Debug/xenia-base-tests
+  - ./xenia-build build --config=debug --target=xenia-base-tests
+  - ./build/bin/Linux/Debug/xenia-base-tests
+
+  # TODO(DrChat): Enable builds in the future.
   # Build all of xenia.
   #- ./xenia-build build --config=debug
   # All tests (without haswell support).
diff --git a/premake5.lua b/premake5.lua
index 0d33ac11b..39a9ae46c 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -80,6 +80,7 @@ filter("platforms:Linux")
 filter({"platforms:Linux", "language:C++"})
   buildoptions({
     "-std=c++14",
+    "-stdlib=libc++",
   })
 
 filter("platforms:Windows")