change for cargo_metadata

master
huangjj27 7 years ago
parent ee9116d2e0
commit c713477ac8
  1. 12
      src/bindgen.rs

@ -1,11 +1,11 @@
//! Functionality related to installing and running `wasm-bindgen`. //! Functionality related to installing and running `wasm-bindgen`.
use binaries::{self, bin_path, install_binaries_from_targz_at_url}; use binaries::{self, bin_path, install_binaries_from_targz_at_url};
use cargo_metadata;
use emoji; use emoji;
use error::Error; use error::Error;
use progressbar::Step; use progressbar::Step;
use slog::Logger; use slog::Logger;
use std::env;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::Command; use std::process::Command;
use target; use target;
@ -127,11 +127,11 @@ pub fn wasm_bindgen_build(
let out_dir = out_dir.to_str().unwrap(); let out_dir = out_dir.to_str().unwrap();
if let Some(wasm_bindgen_path) = wasm_bindgen_path(log, path) { if let Some(wasm_bindgen_path) = wasm_bindgen_path(log, path) {
let target_path = match env::var("CARGO_TARGET_DIR") { let manifest = path.join("Cargo.toml");
Ok(path) => PathBuf::from(&path), let target_path = cargo_metadata::metadata(Some(&manifest))
Err(_) => PathBuf::from("target"), .unwrap()
}; .target_directory;
let mut wasm_path = target_path let mut wasm_path = PathBuf::from(&target_path)
.join("wasm32-unknown-unknown") .join("wasm32-unknown-unknown")
.join(release_or_debug) .join(release_or_debug)
.join(binary_name); .join(binary_name);

Loading…
Cancel
Save