Bump LLVM version requirements (#11)

* Bump LLVM version requirements * Fix Travis tests
denzp · May 4, 2018 · 61de72f · 61de72f
1 parent f7f0c68
commit 61de72f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,32 +3,23 @@ cache: cargo
 
 matrix:
   include:
-    - os: linux
-      rust: stable
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
-          packages:
-            - g++-6
-            - llvm-5.0-dev
-
     - os: linux
       rust: nightly
+      env:
+        - LLVM_SYS_60_PREFIX="/usr/lib/llvm-6.0"
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
           packages:
-            - g++-6
-            - llvm-5.0-dev
+            - llvm-6.0-dev
 
     - os: osx
-      rust: stable
+      rust: nightly
       env:
-        - MATRIX_EVAL="brew install llvm && export LLVM_SYS_50_PREFIX=/usr/local/opt/llvm"
+        - LLVM_SYS_60_PREFIX="/usr/local/opt/llvm"
+        - MATRIX_EVAL="brew install llvm"
 
 before_install:
   - eval "${MATRIX_EVAL}"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ptx-linker"
-version = "0.5.1"
+version = "0.6.0"
 description = "NVPTX modules linker"
 authors = ["Denys Zariaiev <denys.zariaiev@gmail.com>"]
 repository = "https://github.com/denzp/rust-ptx-linker"
@@ -20,14 +20,17 @@ path = "src/application/main.rs"
 name = "ptx_linker"
 
 [dependencies]
-llvm-sys = "50"
 log = "0.3"
 fern = "0.4"
 colored = "1.5"
 error-chain = "0.10"
 ar = "0.5"
 clap = { version = "2.31", features = ["yaml", "suggestions", "color"] }
 
+[dependencies.llvm-sys]
+version = "60"
+features = ["strict-versioning"]
+
 [dev-dependencies]
 difference = "1.0"
 tempdir = "0.3"