From a397add8a7d565a4d2a71a96dd21c543959abde0 Mon Sep 17 00:00:00 2001 From: Christoph Schulz Date: Thu, 22 Dec 2016 14:35:11 +0100 Subject: [PATCH 1/2] Partial fix for #38489. --- .../target/asmjs_unknown_emscripten.rs | 5 +++-- src/librustc_back/target/emscripten_base.rs | 19 +++++++++++++++++++ src/librustc_back/target/mod.rs | 1 + .../target/wasm32_unknown_emscripten.rs | 5 +++-- 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/librustc_back/target/emscripten_base.rs diff --git a/src/librustc_back/target/asmjs_unknown_emscripten.rs b/src/librustc_back/target/asmjs_unknown_emscripten.rs index d86a9b09327..942e6238573 100644 --- a/src/librustc_back/target/asmjs_unknown_emscripten.rs +++ b/src/librustc_back/target/asmjs_unknown_emscripten.rs @@ -9,11 +9,12 @@ // except according to those terms. use super::{Target, TargetOptions}; +use super::emscripten_base::{cmd}; pub fn target() -> Result { let opts = TargetOptions { - linker: "emcc".to_string(), - ar: "emar".to_string(), + linker: cmd("emcc"), + ar: cmd("emar"), dynamic_linking: false, executables: true, diff --git a/src/librustc_back/target/emscripten_base.rs b/src/librustc_back/target/emscripten_base.rs new file mode 100644 index 00000000000..0c800271d04 --- /dev/null +++ b/src/librustc_back/target/emscripten_base.rs @@ -0,0 +1,19 @@ +// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#[cfg(not(windows))] +pub fn cmd(name: &str) -> String { + name.to_string() +} + +#[cfg(windows)] +pub fn cmd(name: &str) -> String { + [name, ".bat"].concat() +} diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 13333be66f5..f7ccd065601 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -58,6 +58,7 @@ mod apple_ios_base; mod arm_base; mod bitrig_base; mod dragonfly_base; +mod emscripten_base; mod freebsd_base; mod haiku_base; mod linux_base; diff --git a/src/librustc_back/target/wasm32_unknown_emscripten.rs b/src/librustc_back/target/wasm32_unknown_emscripten.rs index 77ab4fcae70..9cfcd5d35b1 100644 --- a/src/librustc_back/target/wasm32_unknown_emscripten.rs +++ b/src/librustc_back/target/wasm32_unknown_emscripten.rs @@ -9,11 +9,12 @@ // except according to those terms. use super::{Target, TargetOptions}; +use super::emscripten_base::{cmd}; pub fn target() -> Result { let opts = TargetOptions { - linker: "emcc".to_string(), - ar: "emar".to_string(), + linker: cmd("emcc"), + ar: cmd("emar"), dynamic_linking: false, executables: true, From 14994ac6b67cdaff1692f836e3495a75f4f7d71b Mon Sep 17 00:00:00 2001 From: Christoph Schulz Date: Mon, 26 Dec 2016 11:57:01 +0100 Subject: [PATCH 2/2] Use cfg!() to get type checking everywhere. --- src/librustc_back/target/emscripten_base.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/librustc_back/target/emscripten_base.rs b/src/librustc_back/target/emscripten_base.rs index 0c800271d04..bacada3f5ab 100644 --- a/src/librustc_back/target/emscripten_base.rs +++ b/src/librustc_back/target/emscripten_base.rs @@ -8,12 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[cfg(not(windows))] pub fn cmd(name: &str) -> String { - name.to_string() -} - -#[cfg(windows)] -pub fn cmd(name: &str) -> String { - [name, ".bat"].concat() + if cfg!(windows) { + format!("{}.bat", name) + } else { + name.to_string() + } }