Skip to content

Commit

Permalink
Try fixing LLVM issues on OSX
Browse files Browse the repository at this point in the history
(Also, get a decent grep)
  • Loading branch information
ilyvion committed Jun 30, 2020
1 parent f32be1e commit f479d73
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ install:
- 'if [[ -f ".travis/${TRAVIS_OS_NAME}_install.sh" ]]; then . .travis/${TRAVIS_OS_NAME}_install.sh; fi'
script:
- 'if [[ -f ".travis/${TRAVIS_OS_NAME}_script.sh" ]]; then . .travis/${TRAVIS_OS_NAME}_script.sh; fi'
- export DEFAULT_TARGET=$(rustup show | grep default | grep -Po "^[^-]+-\K\S+")
- [ "$TRAVIS_OS_NAME" = linux ] && export GREP=grep || export GREP=ggrep
- export DEFAULT_TARGET=$(rustup show | grep default | $GREP -Po "^[^-]+-\K\S+")
- pushd tcod_sys; cargo build --features generate_bindings; popd
- 'export BINDINGS_FILE=${DEFAULT_TARGET}_bindings.rs; echo "$BINDINGS_FILE download:"'
- curl -F "file=@./tcod_sys/${BINDINGS_FILE}" https://file.io/ | grep -Po '"link":"\K[^"]+'
- curl -F "file=@./tcod_sys/${BINDINGS_FILE}" https://file.io/ | $GREP -Po '"link":"\K[^"]+'
- cargo build --verbose
- cargo test --verbose
- cargo test --features "rustc-serialize serde" --verbose
Expand Down
5 changes: 3 additions & 2 deletions .travis/osx_script.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash

export PATH="/usr/local/opt/llvm/bin:$PATH"
export LIBCLANG_PATH="/usr/local/opt/llvm/bin"
export PATH="$(brew --prefix llvm)/bin:$PATH"
export LIBCLANG_PATH="$(brew --prefix llvm)/lib"

1 change: 1 addition & 0 deletions tcod_sys/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![allow(non_camel_case_types, non_snake_case, non_upper_case_globals)]
#![allow(clippy::missing_safety_doc, clippy::redundant_static_lifetimes)]
#![allow(improper_ctypes)]

include!(concat!("./", env!("BINDINGS_TARGET"), "_bindings.rs"));

0 comments on commit f479d73

Please sign in to comment.