Skip to content

Commit cc3630d

Browse files
committed
Add clang version and static feature flags
1 parent d7fd058 commit cc3630d

File tree

4 files changed

+80
-47
lines changed

4 files changed

+80
-47
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ install:
2323
script:
2424
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LIBCLANG_STATIC_PATH=~/clang/lib; fi
2525
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LLVM_CONFIG_PATH=/usr/local/bin/llvm-config-3.8; export LIBCLANG_STATIC_PATH=`/usr/local/bin/llvm-config-3.8 --libdir`; fi
26-
- cargo build --verbose
27-
- RUST_TEST_THREADS=1 cargo test --verbose
26+
- cargo build --verbose --features "clang_3_8 static"
27+
- RUST_TEST_THREADS=1 cargo test --verbose --features "clang_3_8 static"
2828

2929
after_success: |
3030
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

Cargo.lock

Lines changed: 61 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@ authors = ["Jupp Müller <[email protected]>"]
55
license = "MIT"
66
build = "build.rs"
77

8+
[features]
9+
runtime = ["clang/runtime"]
10+
static = ["clang/static"]
11+
12+
clang_3_5 = ["clang/clang_3_5"]
13+
clang_3_6 = ["clang/clang_3_6", "gte_clang_3_6"]
14+
clang_3_7 = ["clang/clang_3_7", "gte_clang_3_6", "gte_clang_3_7"]
15+
clang_3_8 = ["clang/clang_3_8", "gte_clang_3_6", "gte_clang_3_7", "gte_clang_3_8"]
16+
clang_3_9 = ["clang/clang_3_9", "gte_clang_3_6", "gte_clang_3_7", "gte_clang_3_8", "gte_clang_3_9"]
17+
18+
gte_clang_3_6 = []
19+
gte_clang_3_7 = []
20+
gte_clang_3_8 = []
21+
gte_clang_3_9 = []
22+
823
[dev-dependencies]
924
tempdir = "*"
1025

@@ -18,10 +33,7 @@ clap = "*"
1833
rand = "*"
1934
log = "*"
2035
env_logger = "*"
21-
22-
[dependencies.clang]
23-
version = "*"
24-
features = ["clang_3_8", "static"]
36+
clang = "*"
2537

2638
[dependencies.handlebars]
2739
version = "*"

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ install:
99
- set LIBCLANG_PATH=C:\LLVM\bin
1010

1111
build_script:
12-
- cargo build --verbose --release
12+
- cargo build --verbose --release --features clang_3_8
1313

1414
test_script:
1515
- set RUST_BACKTRACE=1

0 commit comments

Comments
 (0)