From 49cbfd3f9d42207ebd7bd6613dec075c20e61a52 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sat, 2 Jun 2018 12:58:34 +0800
Subject: Travis CI - Enable OSX builds

---
 .travis.yml | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0dc40d9a..5af7b34b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,40 @@
 language: cpp
 
 sudo: false
-os: linux
-addons:
- apt:
-  sources:
-    - ubuntu-toolchain-r-test
-  packages:
-    - g++-6
-    - zlib1g-dev
-    - valgrind
+
+matrix:
+  include:
+   # Linux
+   - os: linux
+     env:
+      - CC=gcc-6
+      - CC=g++-6
+     addons:
+      apt:
+       sources:
+         - ubuntu-toolchain-r-test
+       packages:
+         - g++-6
+         - zlib1g-dev
+         - valgrind
+   # OSX
+   - os: osx
 
 install:
  # Build mrustc
  - make RUSTCSRC
- - CC=gcc-6 CXX=g++-6 make -j 2
- - CC=gcc-6 CXX=g++-6 make -C tools/minicargo
+ - make -j 2
+ - make -C tools/minicargo
 
 script:
- - CC=gcc-6 CXX=g++-6 make -f minicargo.mk output/libtest.hir
+ - make -f minicargo.mk output/libtest.hir
 # libstd and hello_world
- - CC=gcc-6 make test TAIL_COUNT=2
+ - make test TAIL_COUNT=2
 # rustc (DISABLED: llvm build)
-# - CC=gcc-6 CXX=g++-6 make -f minicargo.mk output/rustc
+# - make -f minicargo.mk output/rustc
 # Tests
- - CC=gcc-6 CXX=g++-6 make local_tests -k
+ - make local_tests -k
 # - CC=gcc-6 make rust_tests -k
 # cargo
-# - CC=gcc-6 CXX=g++-6 make -f minicargo.mk output/cargo
+# - make -f minicargo.mk output/cargo
 # - cat output/cargo-build/cargo_dbg.txt
-- 
cgit v1.2.3