From 7d7b94804b376ab285d1fc48119fa3e9f3085fda Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Fri, 2 Feb 2018 13:35:50 +0100
Subject: [PATCH] Rewrite .travis.yml for second edition

---
 .travis.yml | 51 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac22ca8b..38a1f2a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,5 @@
 language: rust
 
-rust:
-    - nightly
-
-cache:
-  directories:
-     - $HOME/.cargo
-     - $HOME/.xargo
-     - $TRAVIS_BUILD_DIR/target
-
-before_script:
-  - rustup component add rust-src
-  - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)
-  - (test -x $HOME/.cargo/bin/xargo || cargo install xargo)
-  - cargo install-update -a
-
 sudo: false
 
 notifications:
@@ -22,10 +7,42 @@ notifications:
         on_success: never
         on_failure: change
 
+rust:
+    - nightly
+
+os:
+  - linux
+  - osx
+
 addons:
   apt:
+    sources:
+      - llvm-toolchain-trusty-5.0
     packages:
-      - nasm
+      - lld-5.0
+
+cache:
+  directories:
+    - $HOME/.cargo
+    - $HOME/.xargo
+    - $TRAVIS_BUILD_DIR/target
+
+before_install:
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      set -e
+      LLVM_URL="https://releases.llvm.org/5.0.1/clang+llvm-5.0.1-x86_64-apple-darwin.tar.xz"
+      travis_retry wget -O llvm.tar.xz -nv ${LLVM_URL}
+      tar -xJ -f llvm.tar.xz
+      export PATH="`pwd`/clang+llvm-5.0.1-final-x86_64-apple-darwin/bin:$PATH"
+    fi
+
+before_script:
+  - rustup component add rust-src
+  - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)
+  - (test -x $HOME/.cargo/bin/xargo || cargo install xargo)
+  - (test -x $HOME/.cargo/bin/bootimage || cargo install bootimage)
+  - cargo install-update -a
 
 script:
-  - make
+  - bootimage --target x86_64-blog_os