]> git.bitcoin.ninja Git - ldk-java/commitdiff
[TS] Link wasm32-wasi libc as rustc no longer does by default
authorMatt Corallo <git@bluematt.me>
Tue, 28 Jun 2022 21:55:27 +0000 (21:55 +0000)
committerMatt Corallo <git@bluematt.me>
Wed, 29 Jun 2022 19:08:50 +0000 (19:08 +0000)
.github/workflows/build.yml
genbindings.sh

index 5bad5ef8b19234f9f956f45882aeb22f23cc5f18..f4d683bb6d9403ddd29de64b3d54018efb3d9659 100644 (file)
@@ -17,7 +17,7 @@ jobs:
         run: |
           apt-get update
           apt-get -y dist-upgrade
-          apt-get -y install cargo libstd-rust-dev-wasm32 lld git g++ clang curl node-typescript npm python3
+          apt-get -y install cargo libstd-rust-dev-wasm32 lld git g++ clang curl node-typescript npm python3 wasi-libc
           echo "int main() {}" > genbindings_wasm_test_file.c
           clang -nostdlib -o /dev/null --target=wasm32-wasi -Wl,--no-entry genbindings_wasm_test_file.c
           rm genbindings_wasm_test_file.c
index cd926a4b421f66e4af47b4b61d2c409210680f14..a78e57ed4a2ab79e05b486c7debbbf17610074e3 100755 (executable)
@@ -203,8 +203,7 @@ else
        echo "Building TS bindings..."
        COMPILE="$COMMON_COMPILE -flto -Wl,--no-entry -nostdlib --target=wasm32-wasi -Wl,-z -Wl,stack-size=$((8*1024*1024)) -Wl,--initial-memory=$((16*1024*1024)) -Wl,--max-memory=$((1024*1024*1024)) -Wl,--global-base=4096"
        # We only need malloc and assert/abort, but for now just use WASI for those:
-       #EXTRA_LINK=/usr/lib/wasm32-wasi/libc.a
-       EXTRA_LINK=
+       EXTRA_LINK=/usr/lib/wasm32-wasi/libc.a
        [ "$3" != "false" ] && COMPILE="$COMPILE -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,reallocarray -Wl,-wrap,malloc -Wl,-wrap,aligned_alloc -Wl,-wrap,free"
        if [ "$3" = "true" ]; then
                WASM_FILE=liblightningjs_debug.wasm