Skip to content

fix #18: release Debug build fail on windows #22

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

Merged
octavonce merged 1 commit into from
Apr 22, 2020
Merged

fix #18: release Debug build fail on windows #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions libmimalloc-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ fn main() {
// This set mi_option_verbose and mi_option_show_errors options to false.
cfg = cfg.define("mi_defines", "MI_DEBUG=0");

let is_debug = match get_cmake_build_type() {
Ok(CMakeBuildType::Debug) => true,
Ok(CMakeBuildType::Release) => false,
Ok(CMakeBuildType::RelWithDebInfo) => false,
Ok(CMakeBuildType::MinSizeRel) => false,
let (is_debug, win_folder) = match get_cmake_build_type() {
Ok(CMakeBuildType::Debug) => (true, "Debug"),
Ok(CMakeBuildType::Release) => (false, "Release"),
Ok(CMakeBuildType::RelWithDebInfo) => (false, "RelWithDebInfo"),
Ok(CMakeBuildType::MinSizeRel) => (false, "MinSizeRel"),
Err(e) => panic!("Cannot determine CMake build type: {}", e),
};

Expand All @@ -99,32 +99,37 @@ fn main() {
}
}

let (out_dir, out_name) = if cfg!(all(windows, target_env = "msvc")) {
let mut out_dir = "./build".to_string();
if cfg!(all(windows, target_env = "msvc")) {
out_dir.push_str("/");
out_dir.push_str(win_folder);
}
let out_name = if cfg!(all(windows, target_env = "msvc")) {
if is_debug {
if cfg!(feature = "secure") {
("./build/Debug", "mimalloc-static-secure-debug")
"mimalloc-static-secure-debug"
} else {
("./build/Debug", "mimalloc-static-debug")
"mimalloc-static-debug"
}
} else {
if cfg!(feature = "secure") {
("./build/Release", "mimalloc-static-secure")
"mimalloc-static-secure"
} else {
("./build/Release", "mimalloc-static")
"mimalloc-static"
}
}
} else {
if is_debug {
if cfg!(feature = "secure") {
("./build", "mimalloc-secure-debug")
"mimalloc-secure-debug"
} else {
("./build", "mimalloc-debug")
"mimalloc-debug"
}
} else {
if cfg!(feature = "secure") {
("./build", "mimalloc-secure")
"mimalloc-secure"
} else {
("./build", "mimalloc")
"mimalloc"
}
}
};
Expand Down