diff --git a/crates/neon-runtime/Cargo.toml b/crates/neon-runtime/Cargo.toml index 22356c0ee..a99f3f79e 100644 --- a/crates/neon-runtime/Cargo.toml +++ b/crates/neon-runtime/Cargo.toml @@ -13,5 +13,5 @@ links = "neon" build = "build.rs" [build-dependencies] -gcc = "0.3.52" +cc = "1.0" regex = "0.2" diff --git a/crates/neon-runtime/build.rs b/crates/neon-runtime/build.rs index 4c47d4bb3..0ba4508cf 100644 --- a/crates/neon-runtime/build.rs +++ b/crates/neon-runtime/build.rs @@ -1,8 +1,9 @@ -extern crate gcc; +extern crate cc; extern crate regex; use std::process::Command; use std::env; +use std::path::Path; use regex::Regex; fn main() { @@ -115,7 +116,8 @@ fn link_library() { format!("build\\{}\\obj\\neon\\neon.obj", configuration) }; - gcc::Build::new().object(object_path).compile("libneon.a"); + let object_path = Path::new(&object_path).canonicalize().expect("neon.o was not made"); + cc::Build::new().object(object_path).compile("libneon.a"); } fn debug() -> bool { diff --git a/crates/neon-runtime/package.json b/crates/neon-runtime/package.json index 064bd1c77..a53a152df 100644 --- a/crates/neon-runtime/package.json +++ b/crates/neon-runtime/package.json @@ -7,10 +7,8 @@ "build-release": "node-gyp build", "build-debug": "node-gyp build --debug" }, - "devDependencies": { - "nan": "^2.10.0" - }, "dependencies": { + "nan": "^2.10.0", "bindings": "1.2.1", "node-gyp": "^3.5.0" }