Skip to content

Commit

Permalink
Merge #31
Browse files Browse the repository at this point in the history
31: Fix build script to build boehm with `use_boehm` flag r=ltratt a=jacob-hughes

I had forgotten switch this over in 8e8501, and because my dependencies
were cached locally (and on the build server!), I didn't notice.

Co-authored-by: Jacob Hughes <jh@jakehughes.uk>
  • Loading branch information
bors[bot] and jacob-hughes authored Oct 29, 2020
2 parents fcfe3c4 + a8bfccd commit 938fcea
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ where
}

fn main() {
if env::var_os("CARGO_FEATURE_RUSTC_BOEHM").is_some() {
// The Boehm GC is already linked statically through the rustc_boehm
// fork, so there's no need to build it again here.
if env::var_os("CARGO_FEATURE_USE_BOEHM").is_none() {
// The Boehm GC should only be built and linked if compiled with that
// feature flag.
return;
}

Expand Down

0 comments on commit 938fcea

Please sign in to comment.