Skip to content

travis: try to fix build #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ before_script:
- echo $LIBCLANG_PATH

script:
- cargo build
- cargo build --verbose
- cargo build --verbose --features llvm_stable
- make test
- git add -A
- git diff-index --quiet HEAD
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ syntex_syntax = "0.32"

[features]
static = []
llvm_stable = []

[lib]
name = "bindgen"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ BINDGEN := ./target/debug/bindgen

.PHONY: $(BINDGEN)
$(BINDGEN):
cargo build
[ -f $@ ] || cargo build

.PHONY: test
test: regen-tests
Expand Down
9 changes: 9 additions & 0 deletions src/clang.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,19 @@ impl Cursor {
}
}

#[cfg(not(feature="llvm_stable"))]
pub fn is_inlined_function(&self) -> bool {
unsafe { clang_Cursor_isFunctionInlined(self.x) != 0 }
}

// TODO: Remove this when LLVM 3.9 is released.
//
// This is currently used for CI purposes.
#[cfg(feature="llvm_stable")]
pub fn is_inlined_function(&self) -> bool {
false
}

// bitfield
pub fn bit_width(&self) -> Option<u32> {
unsafe {
Expand Down
1 change: 1 addition & 0 deletions src/clangll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,7 @@ extern "C" {
pub fn clang_Type_getTemplateArgumentAsType(T: CXType, i: c_int) ->
CXType;
pub fn clang_Cursor_isBitField(C: CXCursor) -> c_uint;
#[cfg(not(feature="llvm_stable"))]
pub fn clang_Cursor_isFunctionInlined(C: CXCursor) -> c_uint;
pub fn clang_isVirtualBase(arg1: CXCursor) -> c_uint;
pub fn clang_getCXXAccessSpecifier(arg1: CXCursor) ->
Expand Down