From: Matt Corallo <git@bluematt.me>
Date: Mon, 27 Jun 2022 20:09:23 +0000 (+0000)
Subject: [Java] Handle different ldk lib paths in the ar in genbindings.sh
X-Git-Tag: v0.0.108.0^2~8
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=afb20259bc2191ba7525fe75cd48a49d63dcc2c5;p=ldk-java

[Java] Handle different ldk lib paths in the ar in genbindings.sh
---

diff --git a/genbindings.sh b/genbindings.sh
index 253b8aad..cd926a4b 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"