From 236d590a87210e9f3c01ec51519324224ec37f99 Mon Sep 17 00:00:00 2001 From: NikVolf Date: Wed, 27 Dec 2017 17:50:31 +0300 Subject: [PATCH] path -> triplet --- build/src/main.rs | 12 ++++++------ build/src/source.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/src/main.rs b/build/src/main.rs index 762c48c..dfdb7d8 100644 --- a/build/src/main.rs +++ b/build/src/main.rs @@ -41,8 +41,8 @@ pub fn process_output(input: &source::SourceInput) -> Result<(), Error> { let wasm_name = input.bin_name().to_string().replace("-", "_"); cargo_path.push( match input.target() { - source::SourceTarget::Emscripten => source::EMSCRIPTEN_PATH, - source::SourceTarget::Unknown => source::UNKNOWN_PATH, + source::SourceTarget::Emscripten => source::EMSCRIPTEN_TRIPLET, + source::SourceTarget::Unknown => source::UNKNOWN_TRIPLET, } ); cargo_path.push("release"); @@ -104,13 +104,13 @@ fn main() { let wasm_binary = matches.value_of("wasm").expect("is required; qed"); let mut source_input = source::SourceInput::new(target_dir, wasm_binary); - let source_target_val = matches.value_of("source_target").unwrap_or_else(|| source::EMSCRIPTEN_PATH); - if source_target_val == source::UNKNOWN_PATH { + let source_target_val = matches.value_of("source_target").unwrap_or_else(|| source::EMSCRIPTEN_TRIPLET); + if source_target_val == source::UNKNOWN_TRIPLET { source_input = source_input.unknown() - } else if source_target_val == source::EMSCRIPTEN_PATH { + } else if source_target_val == source::EMSCRIPTEN_TRIPLET { source_input = source_input.emscripten() } else { - println!("--target can be: '{}' or '{}'", source::EMSCRIPTEN_PATH, source::UNKNOWN_PATH); + println!("--target can be: '{}' or '{}'", source::EMSCRIPTEN_TRIPLET, source::UNKNOWN_TRIPLET); ::std::process::exit(1); } diff --git a/build/src/source.rs b/build/src/source.rs index bdeb230..627bed6 100644 --- a/build/src/source.rs +++ b/build/src/source.rs @@ -1,7 +1,7 @@ //! Configuration of source binaries -pub const UNKNOWN_PATH: &str = "wasm32-unknown-unknown"; -pub const EMSCRIPTEN_PATH: &str = "wasm32-unknown-emscripten"; +pub const UNKNOWN_TRIPLET: &str = "wasm32-unknown-unknown"; +pub const EMSCRIPTEN_TRIPLET: &str = "wasm32-unknown-emscripten"; /// Target configiration of previous build step #[derive(Debug, Clone, Copy)]