Skip to content

Commit 984a656

Browse files
authored
Merge pull request #25 from rolftimmermans/master
Optionally compile override feature.
2 parents 99a8c42 + ded3042 commit 984a656

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ libmimalloc-sys = { path = "libmimalloc-sys", version = "0.1.15", default-featur
2525
[features]
2626
default = ["secure"]
2727
secure = ["libmimalloc-sys/secure"]
28+
override = ["libmimalloc-sys/override"]

libmimalloc-sys/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ cmake = "0.1"
1616

1717
[features]
1818
secure = []
19+
override = []

libmimalloc-sys/build.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@ fn get_cmake_build_type() -> Result<CMakeBuildType, String> {
6363
fn main() {
6464
let mut cfg = &mut Config::new("c_src/mimalloc");
6565

66-
cfg = cfg.define("MI_OVERRIDE", "OFF");
66+
if cfg!(feature = "override") {
67+
cfg = cfg.define("MI_OVERRIDE", "ON");
68+
} else {
69+
cfg = cfg.define("MI_OVERRIDE", "OFF");
70+
}
71+
6772
cfg = cfg.define("MI_BUILD_TESTS", "OFF");
6873

6974
if cfg!(feature = "secure") {

0 commit comments

Comments
 (0)