Skip to content

Commit

Permalink
Merge pull request #515 from neon-bindings/backout-463
Browse files Browse the repository at this point in the history
Back out #463 in order to merge #400 instead
  • Loading branch information
dherman committed May 15, 2020
2 parents b2d3514 + ae6007c commit fe3f93f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
5 changes: 0 additions & 5 deletions crates/neon-build/src/lib.rs
Expand Up @@ -22,11 +22,6 @@ cfg_if! {
println!("cargo:rustc-link-search=native={}", &node_lib_path.display());
println!("cargo:rustc-link-lib={}", &node_lib_file_path.file_stem().unwrap().to_str().unwrap());

if cfg!(target_env = "msvc") && debug
{
println!("cargo:rustc-link-lib=msvcrtd");
}

// Link `win_delay_load_hook.obj` for windows electron
let node_runtime_env = "npm_config_runtime";
println!("cargo:rerun-if-env-changed={}", node_runtime_env);
Expand Down
3 changes: 3 additions & 0 deletions src/lib.rs
Expand Up @@ -352,6 +352,9 @@ macro_rules! neon_stringify {
}
}

#[cfg(all(windows, not(neon_profile = "release")))]
compile_error!("Neon only builds with --release. For tests, try `cargo test --release`.");

#[cfg(test)]
mod tests {
extern crate rustversion;
Expand Down

0 comments on commit fe3f93f

Please sign in to comment.