Llvm config #174
Closed
Llvm config #174
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
Would like to, still waiting on confirmation from HQ on receipt of the contributor agreement. Sorry. Will pull following that. |
Ubuntu ships the llvm bindings in /usr/lib/ocaml/llvm/ but Fedora is installing them directly in /usr/lib/ocaml so we need to check there as well. The patch is untested; Fedora 14, the current beta, includes llvm 2.7. It does add an unnecessary -I directive, but should at least have a better chance of working on Fedora 15.
This change is thanks to Peter Hull, who independently resolved the 2.8 vs 2.8svn issue this way. His patch checked the version string against a fixed set of options, which is easier to read and simpler to adjust in the future.
|
This branch was cherrypicked into graydon/rust master as of eec259f. Thanks! |
oli-obk
added a commit
to oli-obk/rust
that referenced
this pull request
Jul 19, 2017
run test suite also against libstd with full MIR
kazcw
pushed a commit
to kazcw/rust
that referenced
this pull request
Oct 23, 2018
dlrobertson
pushed a commit
to dlrobertson/rust
that referenced
this pull request
Nov 29, 2018
Link to the rustdoc book for doc attribute docs.
djtech-dev
pushed a commit
to djtech-dev/rust
that referenced
this pull request
Dec 9, 2021
Don't increment the iterator while a Section/Relocation/Symbol is using it.
matthiaskrgr
pushed a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 7, 2023
Download libgccjit-12-dev package in the CI
celinval
pushed a commit
to celinval/rust-dev
that referenced
this pull request
Jun 4, 2024
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just a reminder to pull the llvm version check patch.
Well, really, I'm just playing with github. Not sure this is easier than posting patches.
NB this commit also resolves #173. Peter's patch also fixes the build, but not the include path issue with Ubuntu's packaged llvm-ocaml.