Skip to content

Commit

Permalink
Fixes build
Browse files Browse the repository at this point in the history
  • Loading branch information
joelgallant committed Oct 23, 2018
1 parent b3b52d5 commit 7469fd1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion crates/neon-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ links = "neon"
build = "build.rs"

[build-dependencies]
gcc = "0.3.52"
cc = "1.0"
regex = "0.2"
6 changes: 4 additions & 2 deletions crates/neon-runtime/build.rs
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions crates/neon-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down

0 comments on commit 7469fd1

Please sign in to comment.