Skip to content
This repository was archived by the owner on Nov 12, 2022. It is now read-only.

Commit f5f4a05

Browse files
author
bors-servo
committed
Auto merge of #197 - larsbergstrom:link_cleanup, r=metajack
Link cleanup r? @metajack @mbrubeck CC @alexcrichton <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/197) <!-- Reviewable:end -->
2 parents 6ca4119 + 88dd3c7 commit f5f4a05

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use std::env;
66
use std::process::{Command, Stdio};
77

88
fn main() {
9-
let out_dir = env::var("OUT_DIR").unwrap();
109
let result = Command::new("make")
1110
.args(&["-R", "-f", "makefile.cargo"])
1211
.stdout(Stdio::inherit())
1312
.stderr(Stdio::inherit())
1413
.status()
1514
.unwrap();
1615
assert!(result.success());
17-
println!("cargo:rustc-flags=-L native={}", out_dir);
16+
println!("cargo:rustc-link-search=native={}", env::var("OUT_DIR").unwrap());
17+
println!("cargo:rustc-link-lib=static=jsglue");
1818
}

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ extern crate log;
1818
#[macro_use]
1919
extern crate heapsize;
2020
extern crate rustc_serialize as serialize;
21+
extern crate mozjs_sys;
2122

2223
pub mod jsapi;
23-
pub mod linkhack;
2424
pub mod rust;
2525
pub mod glue;
2626
pub mod jsval;

src/linkhack.rs

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)