Skip to content

Commit ab4ed50

Browse files
Merge pull request #8 from maximmaxim345/fix/building-on-sh
fix: building on plain POSIX sh
2 parents 15fd2ff + 48e3e4e commit ab4ed50

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

env.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
@echo off
22

33
REM Get script directory
4-
set SCRIPT_DIR=%~dp0
5-
set SCRIPT_DIR=%SCRIPT_DIR:~0,-1%
4+
set WASM32_UNKNOWN_UNKNOWN_STDLIB=%~dp0
5+
set WASM32_UNKNOWN_UNKNOWN_STDLIB=%WASM32_UNKNOWN_UNKNOWN_STDLIB:~0,-1%
66

7-
set WASM32_UNKNOWN_UNKNOWN_STDLIB=%SCRIPT_DIR%
87
set CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUSTFLAGS=-C link-arg=-L%WASM32_UNKNOWN_UNKNOWN_STDLIB%\lib -L %WASM32_UNKNOWN_UNKNOWN_STDLIB%\lib -lstatic=c -lstatic=c++abi --Z wasm_c_abi=spec
98
set CFLAGS_wasm32_unknown_unknown=--sysroot=%WASM32_UNKNOWN_UNKNOWN_STDLIB% -D__OpenBSD__ -D__WASM32_UNKNOWN_UNKNOWN__
109
set CXXFLAGS_wasm32_unknown_unknown=%CFLAGS_wasm32_unknown_unknown% -fexceptions

env.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
#!/usr/bin/env bash
22

33
# Get script directory in a shell-agnostic way
4-
if [ -n "${BASH_SOURCE[0]}" ]; then
4+
if [ -n "${BASH_SOURCE}" ]; then
55
# bash
6-
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
6+
WASM32_UNKNOWN_UNKNOWN_STDLIB="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
77
elif [ -n "$ZSH_VERSION" ]; then
88
# zsh
9-
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
9+
WASM32_UNKNOWN_UNKNOWN_STDLIB="$(cd "$(dirname "$0")" && pwd)"
1010
else
11-
# fallback for sh
12-
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
11+
# fallback for sh, we can't determine this scripts directory, so we assume the current directory
12+
# if it's not, you can set WASM32_UNKNOWN_UNKNOWN_STDLIB_DIR to the correct directory
13+
if [ -n "$WASM32_UNKNOWN_UNKNOWN_STDLIB_DIR" ]; then
14+
WASM32_UNKNOWN_UNKNOWN_STDLIB="$WASM32_UNKNOWN_UNKNOWN_STDLIB_DIR"
15+
else
16+
WASM32_UNKNOWN_UNKNOWN_STDLIB="$(pwd)"
17+
fi
1318
fi
1419

15-
export WASM32_UNKNOWN_UNKNOWN_STDLIB=$SCRIPT_DIR
1620
export CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUSTFLAGS="-C link-arg=-L$WASM32_UNKNOWN_UNKNOWN_STDLIB/lib/ -L $WASM32_UNKNOWN_UNKNOWN_STDLIB/lib/ -lstatic=c -lstatic=c++abi --Z wasm_c_abi=spec"
1721
export CFLAGS_wasm32_unknown_unknown="--sysroot=$WASM32_UNKNOWN_UNKNOWN_STDLIB -D__OpenBSD__ -D__WASM32_UNKNOWN_UNKNOWN__"
1822
export CXXFLAGS_wasm32_unknown_unknown="$CFLAGS_wasm32_unknown_unknown -fexceptions"

0 commit comments

Comments
 (0)