Addition of windows gnu and linux cmake

Author: Ryan Clanton

libmimalloc-sys/build.rs

@@ -95,8 +95,8 @@ fn main() {
         Ok(CMakeBuildType::MinSizeRel) => (false, "MinSizeRel"),
         Err(e) => panic!("Cannot determine CMake build type: {}", e),
     };
-
-    if cfg!(all(windows, target_env = "msvc")) {
+    let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap();
+    if target_env == "msvc" {
         cfg = cfg.define("CMAKE_SH", "CMAKE_SH-NOTFOUND");
 
         // cc::get_compiler have /nologo /MD default flags that are cmake::Config
@@ -109,14 +109,31 @@ fn main() {
             // CMAKE_C_FLAGS + CMAKE_C_FLAGS_RELEASE
             cfg = cfg.cflag("/DWIN32 /D_WINDOWS /W3 /MD /O2 /Ob2 /DNDEBUG");
         }
-    }
+    } else if target_env == "gnu" {
+        cfg = cfg.define("CMAKE_SH", "CMAKE_SH-NOTFOUND");
+        // cc::get_compiler have /nologo /MD default flags that are cmake::Config
+        // defaults to. Those flags prevents mimalloc from building on windows
+        // extracted from default cmake configuration on windows
+        if is_debug {
+            // CMAKE_C_FLAGS + CMAKE_C_FLAGS_DEBUG
+            cfg = cfg.cflag("-static -ffunction-sections -fdata-sections -m64 -O3 -fpic");
+        } else {
+            // CMAKE_C_FLAGS + CMAKE_C_FLAGS_RELEASE
+            cfg = cfg.cflag("-static -ffunction-sections -fdata-sections -m64 -O3 -fpic");
+        }
+    };
 
     let mut out_dir = "./build".to_string();
     if cfg!(all(windows, target_env = "msvc")) {
-        out_dir.push('/');
-        out_dir.push_str(win_folder);
+        if target_env == "msvc" {
+            out_dir.push('/');
+            out_dir.push_str(win_folder);
+        } else if target_env == "gnu" {
+            out_dir.push('/');
+            out_dir.push_str(win_folder);
+        }
     }
-    let out_name = if cfg!(all(windows, target_env = "msvc")) {
+    let out_name = if cfg!(all(windows)) {
         if is_debug {
             if cfg!(feature = "secure") {
                 "mimalloc-static-secure-debug"
@@ -149,7 +166,6 @@ fn main() {
     // Build mimalloc-static
     let mut dst = cfg.build_target("mimalloc-static").build();
     dst.push(out_dir);
-
     println!("cargo:rustc-link-search=native={}", dst.display());
     println!("cargo:rustc-link-lib={}", out_name);
 }

libmimalloc-sys/src/lib.rs

@@ -20,6 +20,13 @@ extern "C" {
     /// Returns a unique pointer if called with `size` 0.
     pub fn mi_malloc(size: usize) -> *mut c_void;
 
+    /// Allocate `count` items of `size` length each.
+    ///
+    /// Returns `null` if `count * size` overflows or on out-of-memory.
+    ///
+    /// All items are initialized to zero.
+    pub fn mi_calloc(count: usize, size: usize) -> *mut c_void;
+
     /// Re-allocate memory to `newsize` bytes.
     ///
     /// Return pointer to the allocated memory or null if out of memory. If null