Skip to content

Fix cfg checks when compiled with --target #207

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Fix cfg checks when compiled with --target #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93f6ffc
Replace cfg! macro with env::var(CARGO_CFG_<cfg>) so it will work wit…
elichai Dec 19, 2019
f4f1eaa
Add docs.rs tests in travis
elichai Dec 19, 2019
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: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ matrix:
name: WebAssembly
install: rustup target add wasm32-unknown-unknown
script: cargo test --target wasm32-unknown-unknown --no-run
- rust: nightly-2019-12-19
name: docs.rs
script: RUSTDOCFLAGS='--cfg procmacro2_semver_exempt' RUSTFLAGS='--cfg procmacro2_semver_exempt' cargo doc --target x86_64-unknown-linux-gnu

before_script:
- set -o errexit
Expand Down
6 changes: 3 additions & 3 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ fn main() {
process::exit(1);
}

let semver_exempt = cfg!(procmacro2_semver_exempt);
let semver_exempt = env::var("CARGO_CFG_PROCMACRO2_SEMVER_EXEMPT").is_ok();
if semver_exempt {
// https://github.com/alexcrichton/proc-macro2/issues/147
println!("cargo:rustc-cfg=procmacro2_semver_exempt");
}

if semver_exempt || cfg!(feature = "span-locations") {
if semver_exempt || env::var("CARGO_FEATURE_SPAN_LOCATIONS").is_ok() {
println!("cargo:rustc-cfg=span_locations");
}

Expand Down Expand Up @@ -84,7 +84,7 @@ fn enable_use_proc_macro(target: &str) -> bool {
}

// Otherwise, only enable it if our feature is actually enabled.
cfg!(feature = "proc-macro")
env::var("CARGO_FEATURE_PROC_MACRO").is_ok()
}

struct RustcVersion {
Expand Down