X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.sh;h=34982335a58067de41476b736a71f40aa3248c62;hb=334f6732f8c2f09f4b169c6ca0ea792c0c1ae48d;hp=c5025982dc36a15704da88bbd69580ee1bcc2d49;hpb=cd94859a3ef20447674f393d3f169bd9e29023a1;p=ldk-c-bindings

diff --git a/genbindings.sh b/genbindings.sh
index c502598..3498233 100755
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -156,7 +156,7 @@ function is_gnu_sed(){
 
 function add_crate() {
 	pushd "$LIGHTNING_PATH/$1"
-	RUSTC_BOOTSTRAP=1 cargo rustc --profile=check --no-default-features $3 -- --cfg=c_bindings -Zunpretty=expanded > /tmp/$1-crate-source.txt
+	RUSTC_BOOTSTRAP=1 cargo rustc --profile=check -Z avoid-dev-deps --no-default-features $3 -- --cfg=c_bindings -Zunpretty=expanded > /tmp/$1-crate-source.txt
 	popd
 	if [ "$HOST_OSX" = "true" ]; then
 		sed -i".original" "1i\\
@@ -191,12 +191,12 @@ if [ "$2" = "true" ]; then
 	add_crate "lightning-persister" "lightning_persister"
 	add_crate "lightning-background-processor" "lightning_background_processor" --features=std
 	add_crate "lightning-invoice" "lightning_invoice" --features=std
-	add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync"
+	add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync" --features=std
 	CARGO_BUILD_ARGS="--features=std"
 else
 	add_crate lightning lightning --features=no-std
 	drop_crate "lightning-persister"
-	add_crate "lightning-background-processor" "lightning_background_processor"
+	add_crate "lightning-background-processor" "lightning_background_processor" --features=no-std
 	add_crate "lightning-rapid-gossip-sync" "lightning_rapid_gossip_sync" --features=no-std
 	add_crate "lightning-invoice" "lightning_invoice" --features=no-std
 	CARGO_BUILD_ARGS="--features=no-std"
@@ -232,7 +232,7 @@ if is_gnu_sed; then
 	sed -i 's/typedef LDKnative.*Import.*LDKnative.*;//g' include/lightning.h
 
 	# UnsafeCell is `repr(transparent)` so should be ignored here
-	sed -i 's/LDKUnsafeCell<\(.*\)> /\1 /g' include/lightning.h
+	sed -i 's/LDKUnsafeCell<\(.*\)> /struct \1 /g' include/lightning.h
 
 	# stdlib.h doesn't exist in clang's wasm sysroot, and cbindgen
 	# doesn't actually use it anyway, so drop the import.
@@ -242,7 +242,7 @@ else
 	sed -i '' 's/typedef LDKnative.*Import.*LDKnative.*;//g' include/lightning.h
 
 	# UnsafeCell is `repr(transparent)` so should be ignored by cbindgen
-	sed -i '' 's/LDKUnsafeCell<\(.*\)> /\1 /g' include/lightning.h
+	sed -i '' 's/LDKUnsafeCell<\(.*\)> /struct \1 /g' include/lightning.h
 
 	# stdlib.h doesn't exist in clang's wasm sysroot, and cbindgen
 	# doesn't actually use it anyway, so drop the import.