Merge pull request #122 from maleadt/tb/macos_triple

Use the Julia triple, not the LLVM one.
maleadt · Nov 13, 2018 · 63e6d84 · 63e6d84
2 parents 80d41f5 + 001404e
commit 63e6d84
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ julia:
 
 matrix:
   allow_failures:
-  - julia: 0.7
+  - julia: nightly
     os: osx
 
 notifications:

diff --git a/deps/build.jl b/deps/build.jl
@@ -45,7 +45,6 @@ function main()
         occursin("LLVM", basename(lib))
     end
     if isempty(libllvm_paths)
-        @show Libdl.dllist()
         build_error("""
             Cannot find the LLVM library loaded by Julia.
             Please use a version of Julia that has been built with USE_LLVM_SHLIB=1 (like the official binaries).

diff --git a/examples/Kaleidoscope/run.jl b/examples/Kaleidoscope/run.jl
@@ -42,7 +42,7 @@ function run(mod::LLVM.Module, entry::String)
 end
 
 function write_objectfile(mod::LLVM.Module, path::String)
-    host_triple = LLVM.triple()
+    host_triple = Sys.MACHINE # LLVM.triple() might be wrong (see LLVM.jl#108)
     host_t = LLVM.Target(host_triple)
     LLVM.TargetMachine(host_t, host_triple) do tm
         LLVM.emit(tm, mod, LLVM.API.LLVMObjectFile, path)