diff options
| author | Ralph Giles <giles@thaumas.net> | 2010-10-19 12:05:22 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2010-10-21 16:06:15 -0700 |
| commit | 45056fc022a77c1b7c912ef05c7505d4ab415834 (patch) | |
| tree | 5f8b88cdd730ce92f4e34374b44b550a3d1da54c /src/rt/rust_task.cpp | |
| parent | a7599a79681e98be65cd24bbeef771edc0534409 (diff) | |
| download | rust-45056fc022a77c1b7c912ef05c7505d4ab415834.tar.gz rust-45056fc022a77c1b7c912ef05c7505d4ab415834.zip | |
Update llvm version detection for the 2.8 release.
The LLVM project recently released version 2.8, and updated the SVN tree version to 2.9svn, obsoleting the simple check for 'llvm-config --version' returning 2.8svn. With this commit we instead check for the substrings 2.8 and 2.9 in the output of 'llvm-config --version', since we (currently) support both the svn and released varieties of those versions. A stable release also complicates our check for the ocaml bindings. Previously we looked in `llvm-config --libdir`/ocaml which is appropriate for local compiles, but distribution packagers are likely to put the bindings in the default search path, e.g. /usr/lib/ocaml/llvm. We now fall back to trying variations on the standard library path returned by 'ocamlc -config' if we don't find it under 'llvm-config --libdir'. With this change, rust builds against LLVM 2.8 as packaged in Ubuntu 10.10 as well as LLVM 2.9svn compiled locally. (cherry picked from commit b606b65756f087c403180abd5418fe7dce469758)
Diffstat (limited to 'src/rt/rust_task.cpp')
0 files changed, 0 insertions, 0 deletions
