From e5b0a576b3ceb97b0e32ca2e8ec102bf7b546f79 Mon Sep 17 00:00:00 2001
From: Tim Besard <tim.besard@gmail.com>
Date: Wed, 13 Dec 2017 13:49:33 +0100
Subject: [PATCH] Use better APIs for some minor things.

---
 deps/build.jl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/deps/build.jl b/deps/build.jl
index 97557935..8c1f16f8 100644
--- a/deps/build.jl
+++ b/deps/build.jl
@@ -9,7 +9,7 @@ function llvm_support(version)
     @debug("Using LLVM $version")
 
     InitializeAllTargets()
-    "nvptx" in LLVM.name.(collect(targets())) ||
+    haskey(targets(), "nvptx") ||
         error("Your LLVM does not support the NVPTX back-end. Fix this, and rebuild LLVM.jl and CUDAnative.jl")
 
     target_support = CUDAapi.devices_for_llvm(version)
@@ -120,7 +120,9 @@ function main()
     ## gather info
 
     config[:julia_version] = VERSION
-    config[:julia_llvm_version] = VersionNumber(Base.libllvm_version)
+    config[:julia_llvm_version] = VERSION >= v"0.7.0-DEV.421" ?
+                                    Base.libllvm_version :
+                                    VersionNumber(Base.libllvm_version)
 
     config[:llvm_version] = LLVM.version()
     llvm_targets, llvm_isas = llvm_support(config[:llvm_version])