Skip to content

Commit 8bdd3bf

Browse files
hugo-dcaxic
authored andcommitted
Fix Makefile to correctly parse run(); function name.
Add cargo configuration in order to export cwrap.
1 parent 3831574 commit 8bdd3bf

File tree

3 files changed

+28
-11
lines changed

3 files changed

+28
-11
lines changed

.cargo/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
rustflags = [
44
"-Clink-args=-s NO_DYNAMIC_EXECUTION=1",
55
"-Clink-args=-s NODEJS_CATCH_EXIT=0",
6+
"-Clink-args=-s EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap']",
67
]

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ all:
44
cargo build --target=asmjs-unknown-emscripten --release
55
mkdir -p lib
66
find target/asmjs-unknown-emscripten/release -type f -name "rustbn-js.js" | xargs -I {} cp {} lib/index.asm.js
7-
@res=$$(sed -n '/run()$$/p' lib/index.asm.js | wc -l); \
7+
@res=$$(sed -n '/run();$$/p' lib/index.asm.js | wc -l); \
88
if [ $$res == "0" ]; then \
99
echo "ERROR: could not find run() function in generated code"; \
1010
exit 1; \
1111
fi\
1212

13-
sed -ibak 's/run()$$/Module\["arguments"\]=\[\];run();module\.exports=Module;/' lib/index.asm.js
13+
sed -ibak 's/run();$$/Module\["arguments"\]=\[\];run();module\.exports=Module;/' lib/index.asm.js
1414

1515
wasm:
1616
cargo build --target=wasm32-unknown-emscripten --release

lib/index.asm.js

Lines changed: 25 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)