Skip to content

Commit 3fd516a

Browse files
committed
Fixed linkage
1 parent 2acc1b0 commit 3fd516a

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[package]
22
name = "mimalloc"
3+
links = "libmimalloc"
34
version = "0.1.0"
45
authors = ["Octavian Oncescu <[email protected]>"]
56
edition = "2018"

build.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ use cmake::Config;
22

33
#[cfg(feature = "no_secure")]
44
fn main() {
5-
let dst = Config::new("c_src/mimalloc")
5+
let dst = Config::new("c_src/mimalloc")
66
.build();
77
println!("cargo:rustc-link-search=native={}", dst.display());
8-
//println!("cargo:rustc-link-lib=static=libmimalloc");
98
}
109

1110
#[cfg(not(feature = "no_secure"))]
1211
fn main() {
1312
let dst = Config::new("c_src/mimalloc")
14-
.define("SECURE", "ON")
13+
.define("SECURE", "ON")
1514
.build();
1615
println!("cargo:rustc-link-search=native={}", dst.display());
17-
//println!("cargo:rustc-link-lib=static=libmimalloc");
1816
}

src/ffi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
use libc::{c_void, size_t};
44

55
extern "C" {
6-
pub(crate) fn mi_malloc_aligned(size: size_t, alignment: size_t) -> c_void;
6+
pub(crate) fn mi_malloc_aligned(size: size_t, alignment: size_t) -> *const c_void;
77
pub(crate) fn mi_free(p: *const c_void) -> c_void;
88
}

0 commit comments

Comments
 (0)