X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.sh;h=4102884dc92350ac4cb91565abfefa8d87979b2e;hb=47cbd099c1e14eade497bec41b347ebe6096bc0b;hp=253b8aad94abb4ba912df8f0ce3a0db85d37c685;hpb=c531c84c4f1bfc4dc42e5edbf2d9be3b370468da;p=ldk-java

diff --git a/genbindings.sh b/genbindings.sh
index 253b8aad..4102884d 100755
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -144,7 +144,7 @@ if [ "$2" != "wasm" ]; then
 				echo "Archive contained non-object files!"
 				exit 1
 			fi
-			if [ "$(ar t "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a | grep ldk.ldk.*-cgu.*.rcgu.o | wc -l)" != "1" ]; then
+			if [ "$(ar t "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a | grep ldk.*-cgu.*.rcgu.o | wc -l)" != "1" ]; then
 				echo "Archive contained more than one LDK object file"
 				exit 1
 			fi
@@ -152,9 +152,9 @@ if [ "$2" != "wasm" ]; then
 			rm -f tmp/*
 			ar x --output=tmp "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a
 			pushd tmp
-			llvm-dis ldk.ldk.*-cgu.*.rcgu.o
-			sed -i 's/br i1 icmp eq (i8\* @__cxa_thread_atexit_impl, i8\* null)/br i1 icmp eq (i8* null, i8* null)/g' ldk.ldk.*-cgu.*.rcgu.o.ll
-			llvm-as ldk.ldk.*-cgu.*.rcgu.o.ll -o ./libldk.bc
+			llvm-dis ldk*-cgu.*.rcgu.o
+			sed -i 's/br i1 icmp eq (i8\* @__cxa_thread_atexit_impl, i8\* null)/br i1 icmp eq (i8* null, i8* null)/g' ldk*-cgu.*.rcgu.o.ll
+			llvm-as ldk*-cgu.*.rcgu.o.ll -o ./libldk.bc
 			ar q libldk.a *.o
 			popd
 			LDK_LIB="tmp/libldk.bc tmp/libldk.a"
@@ -189,6 +189,7 @@ else
 		./genbindings.py "./lightning.h" ts ts ts $DEBUG_ARG typescript browser
 	fi
 	rm -f ts/bindings.c
+	sed -i 's/^  "version": .*/  "version": "'${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}'",/g' ts/package.json
 	if [ "$3" = "true" ]; then
 		echo "#define LDK_DEBUG_BUILD" > ts/bindings.c
 	elif [ "$3" = "leaks" ]; then
@@ -203,8 +204,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