Skip to content

Commit

Permalink
Merge pull request #7639 from JuliaLang/sf/llvmversion
Browse files Browse the repository at this point in the history
Add libllvm_version to base_h.jl, include in versioninfo() output
  • Loading branch information
Keno committed Jul 18, 2014
2 parents 49ac85f + a3ab502 commit 8a454ca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions base/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
JULIAHOME = ..
include ../deps/Versions.make
include ../Make.inc

PCRE_CONST = 0x[0-9a-fA-F]+|[-+]?\s*[0-9]+
Expand Down Expand Up @@ -51,6 +52,7 @@ else
endif
@echo "const libfftw_name = \"$(LIBFFTWNAME)\"" >> $@
@echo "const libfftwf_name = \"$(LIBFFTWFNAME)\"" >> $@
@echo "const libllvm_version = \"$(LLVM_VER)\"" >> $@
@echo "const VERSION_STRING = \"$(JULIA_VERSION)\"" >> $@
@echo "const TAGGED_RELEASE_BANNER = \"$(TAGGED_RELEASE_BANNER)\"" >> $@
@echo "const SYSCONFDIR = \"$(sysconfdir)\"" >> $@
Expand Down
1 change: 1 addition & 0 deletions base/interactiveutil.jl
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ function versioninfo(io::IO=STDOUT, verbose::Bool=false)
end
println(io, " LAPACK: ",liblapack_name)
println(io, " LIBM: ",libm_name)
println(io, " LLVM: libLLVM-",libllvm_version)
if verbose
println(io, "Environment:")
for (k,v) in ENV
Expand Down

0 comments on commit 8a454ca

Please sign in to comment.