Allow passing additional clang arguments #57
Merged
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
emilio
reviewed
Jun 30, 2017
src/support.rs
Outdated
| @@ -59,10 +59,10 @@ pub struct Clang { | |||
| impl Clang { | |||
| //- Constructors ----------------------------- | |||
|
|
|||
| fn new(path: PathBuf) -> Clang { | |||
| fn new(path: PathBuf, args: &Vec<String>) -> Clang { | |||
There was a problem hiding this comment.
nit: Make this &[String] instead.
There was a problem hiding this comment.
(or even I: Iterator<Item=&'a str> or something like that).
src/support.rs
Outdated
| @@ -78,9 +78,9 @@ impl Clang { | |||
| /// first directory searched. Then, the directory returned by `llvm-config --bindir` is | |||
| /// searched. On OS X systems, `xcodebuild -find clang` will next be queried. Last, the | |||
| /// directories in the system's `PATH` are searched. | |||
| pub fn find(path: Option<&Path>) -> Option<Clang> { | |||
| pub fn find(path: Option<&Path>, args: &Vec<String>) -> Option<Clang> { | |||
src/support.rs
Outdated
| fn parse_search_paths(path: &Path, language: &str, args: &Vec<String>) -> Option<Vec<PathBuf>> { | ||
| let clang_args = vec!["-E", "-x", language, "-", "-v"]; | ||
| let mut clang_args_temp: Vec<String> = clang_args.into_iter().map(|s| s.to_owned()).collect(); | ||
| clang_args_temp.extend(args.iter().cloned()); |
There was a problem hiding this comment.
you can just:
let mut clang_args = vec!["..."];
clang_args.extend_from_slice(args);
run_clang(..);
added 2 commits
July 1, 2017 03:03
|
I pushed the nits in a separate commit for ease of review. Let me know when it's good to go and I'll squash them into one. |
|
LGTM, but could you fix the test, thanks. |
|
Released as part of |
bors-servo
pushed a commit
to rust-lang/rust-bindgen
that referenced
this pull request
Jul 4, 2017
Passing additional clang arguments for Linux 32 cross compiling This is for https://bugzilla.mozilla.org/show_bug.cgi?id=1366050 But it has to wait for KyleMayes/clang-sys#57 to land and version number bumped. (I'm making up the new version numbers for now.) r? @emilio
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.
Hi Kyle,
I'm trying to fix a linux 64 to 32 cross compiling issue for Stylo. Therefore I'm going to need to pass some additional clang argumens from
bindgen.I'm sorry the code involves some ugly transformations between
&[&str]toVec<String>and back, I'll be glad to change it if there are more elegant way to do it.