Skip to content

Commit

Permalink
Merge pull request #52 from firedancer-io/ll/add-solfuzz-for-easier-t…
Browse files Browse the repository at this point in the history
…riaging

adding solfuzz as a submodule for easier triaging of crashes
  • Loading branch information
llamb-jump authored Jun 24, 2024
2 parents 76c51b9 + ea1495e commit d0ac5b2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
path = impl/agave-v2.0
url = git@github.com:firedancer-io/solfuzz-agave.git
branch = agave-v2.0
[submodule "impl/solfuzz"]
path = impl/solfuzz
url = https://github.com/firedancer-io/solfuzz
branch = main
12 changes: 12 additions & 0 deletions impl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,22 @@ lib/libsolfuzz_firedancer.so:
ln -sf ../firedancer/build/native/clang/lib/libfd_exec_sol_compat.so lib/libsolfuzz_firedancer.so
ln -sf ../firedancer/build/native/clang/lib/libfd_ballet.a lib/libfd_ballet.a

solfuzz/build/fuzz_sol_prog:
mkdir -p bin
[ ! -f solfuzz/shlr/protobuf ] && cd solfuzz && git submodule update --init --recursive && cd - || true
[ ! -f solfuzz/opt/bin/protoc ] && cd solfuzz && sys/deps.sh && cd - || true
cd solfuzz && cmake -B build -DCMAKE_CXX_COMPILER=clang++ . && cmake --build build && cd -

bin/fuzz_sol_prog: solfuzz/build/fuzz_sol_prog
mkdir -p bin
ln -sf $(shell realpath $<) $@

.PHONY: clean
clean:
find lib -name '*.so' -delete || true
find lib -name '*.a' -delete || true
find bin -type l -delete || true
[ -d agave-v1.17 ] && $(MAKE) -C agave-v1.17 clean || true
[ -d agave-v2.0 ] && $(MAKE) -C agave-v2.0 clean || true
[ -d firedancer ] && rm -rf firedancer/opt && $(MAKE) -C firedancer distclean || true
[ -d solfuzz/build ] && rm -rf solfuzz/build || true
1 change: 1 addition & 0 deletions impl/solfuzz
Submodule solfuzz added at b60fef

0 comments on commit d0ac5b2

Please sign in to comment.