X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.sh;h=d1b67580d1a4fcb850db9dcb5fbd5bbfb9ab8613;hb=fe78e0f816f9c186b5946897c449c43d22c7b429;hp=94800ff6416c6921f1021619c32b9c8ba4c78044;hpb=f9ebaf427cdacebc8c784fbc2086e5d8f561f6ee;p=ldk-c-bindings

diff --git a/genbindings.sh b/genbindings.sh
index 94800ff..d1b6758 100755
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -272,7 +272,7 @@ while read LINE; do
 				echo "Unable to find method declaration for $LINE"
 				exit 1
 			fi
-			RETVAL="$(echo "$METHOD" | sed 's/[ ]*\([A-Za-z0-9 _]*\)(\*\(.*\)).*/\1/' | sed 's/^struct LDK/LDK::/g' | tr -d ' ')"
+			RETVAL="$(echo "$METHOD" | sed 's/[ ]*\([A-Za-z0-9 _]*\)(\*\(.*\)).*/\1/' | sed -E 's/^(struct|enum) LDK/LDK::/g' | tr -d ' ')"
 			[ "$RETVAL" = "LDK::SecretKey" ] && RETVAL="LDKSecretKey"
 			[ "$RETVAL" = "LDK::PublicKey" ] && RETVAL="LDKPublicKey"
 			[ "$RETVAL" = "LDK::ThirtyTwoBytes" ] && RETVAL="LDKThirtyTwoBytes"
@@ -509,9 +509,9 @@ if [ "$2" = "false" -a "$(rustc --print target-list | grep wasm32-wasi)" != "" ]
 	echo "int main() {}" > genbindings_wasm_test_file.c
 	if clang -nostdlib -o /dev/null --target=wasm32-wasi -Wl,--no-entry genbindings_wasm_test_file.c > /dev/null 2>&1; then
 		# And if it does, build a WASM binary without capturing errors
-		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32 -O1"
+		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -target wasm32-wasi -O1"
 		RUSTFLAGS="$BASE_RUSTFLAGS -C opt-level=1 --cfg=test_mod_pointers" cargo build $CARGO_BUILD_ARGS -v --target=wasm32-wasi
-		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -fembed-bitcode -target wasm32 -Oz"
+		export CFLAGS_wasm32_wasi="$BASE_CFLAGS -fembed-bitcode -target wasm32-wasi -Oz"
 		RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C opt-level=z -C linker-plugin-lto -C lto" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target=wasm32-wasi
 	else
 		echo "Cannot build WASM lib as clang does not seem to support the wasm32-wasi target"
@@ -559,7 +559,8 @@ if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then
 		CARGO_PROFILE_RELEASE_LTO=true RUSTFLAGS="$RUSTFLAGS -C embed-bitcode=yes -C linker-plugin-lto -C lto -C linker=$CLANG $LINK_ARG_FLAGS -C link-arg=-march=sandybridge -C link-arg=-mcpu=sandybridge -C link-arg=-mtune=sandybridge" cargo build $CARGO_BUILD_ARGS -v --release
 
 		if [ "$2" = "true" ]; then
-			$CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 demo.cpp target/release/libldk.a -ldl
+			$CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -O2 -c demo.cpp -o demo.o
+			$CLANGPP $LOCAL_CFLAGS -flto -fuse-ld=$LLD -Wl,--lto-O2 -Wl,-O2 -O2 demo.o target/release/libldk.a -ldl
 			strip ./a.out
 			echo "C++ Bin size and runtime with cross-language LTO:"
 			ls -lha a.out