Merge pull request bitcoinfuzz#88 from brunoerg/lightning

ldk: improve Makefile

Author: brunoerg

README.md

@@ -5,7 +5,7 @@ Note this project is a WIP and might be not stable.
 
 # Installation
 
-## BitcoinFuzz start modules:
+## Bitcoin modules:
 
 ### rust-bitcoin
 
@@ -50,15 +50,13 @@ export CXXFLAGS="$CXXFLAGS -DBITCOIN_CORE"
 export BOOST_LIB_DIR="path/to/boost/"
 ```
 
-## LightningFuzz start modules:
+## Lightning modules:
 
 ### LDK
 
 ```bash
-export RUST_TARGET="aarch64-apple-darwin"
 cd modules/ldk
-cd ldk_lib && cargo build --release --target=$RUST_TARGET
-cd .. && make
+make cargo && make
 export CXXFLAGS="$CXXFLAGS -DLDK"
 ```
 

modules/ldk/Makefile

@@ -1,9 +1,10 @@
 all: module.a
 
-CXXFLAGS += -Wall -Wextra -std=c++20 -I ../../include
-# MacOS: ./ldk_lib/target/aarch64-apple-darwin/release/libldk_lib.a
-LDK_LIB_PATH := ./ldk_lib/target/$(RUST_TARGET)/release/libldk_lib.a
-LDK_LIB_NAME := libldk_lib.a
+CXXFLAGS += -Wall -Wextra -fsanitize=address,fuzzer -std=c++20 -I ../../include
+LDK_LIB_PATH := ./ldk_lib/target/release/libldk_lib.a
+
+cargo:
+	cd ldk_lib && RUSTFLAGS="-Z sanitizer=address" cargo build --release
 
 module.a: module.o $(LDK_LIB_PATH)
 	bash ../../merge.sh module.a $(LDK_LIB_PATH) module.o
@@ -13,4 +14,4 @@ module.o: module.cpp module.h
 	$(CXX) $(CXXFLAGS) -I . -fPIC -c module.cpp -o module.o
 
 clean:
-	rm -rf *.o module.a
+	rm -rf *.o module.a