Skip to content

Commit

Permalink
Merge pull request #616 from drager/wasm32-target-fix
Browse files Browse the repository at this point in the history
fix: Check for "rustup" rather than ".rustup" when checking for wasm32
  • Loading branch information
ashleygwilliams authored Apr 3, 2019
2 parents 7cb3e87 + 6a0f2fb commit ee1b7e9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/build/wasm_target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ impl fmt::Display for Wasm32Check {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let target = "wasm32-unknown-unknown";

if self.found {
if !self.found {
let rustup_string = if self.is_rustup {
"It looks like Rustup is being used.".to_owned()
} else {
format!("It looks like Rustup is not being used. For non-Rustup setups, the {} target needs to be installed manually. See https://rustwasm.github.io/wasm-pack/book/prerequisites/index.html#target-wasm32-unknown-unknown on how to do this.", target)
format!("It looks like Rustup is not being used. For non-Rustup setups, the {} target needs to be installed manually. See https://rustwasm.github.io/wasm-pack/book/prerequisites/non-rustup-setups.html on how to do this.", target)
};

writeln!(
Expand Down Expand Up @@ -111,9 +111,9 @@ fn check_wasm32_target() -> Result<Wasm32Check, Error> {
})
// If it doesn't exist, then we need to check if we're using rustup.
} else {
// If sysroot contains .rustup, then we can assume we're using rustup
// If sysroot contains "rustup", then we can assume we're using rustup
// and use rustup to add the wasm32-unknown-unknown target.
if sysroot.to_string_lossy().contains(".rustup") {
if sysroot.to_string_lossy().contains("rustup") {
rustup_add_wasm_target().map(|()| Wasm32Check {
rustc_path,
sysroot,
Expand Down

0 comments on commit ee1b7e9

Please sign in to comment.