From 394262751bd166606a11c9db1e16a08b177ad807 Mon Sep 17 00:00:00 2001 From: bloodstalker Date: Sun, 10 Jun 2018 07:47:39 +0430 Subject: fix --- bruiser/makefile | 12 +++++++++--- bruiser/tablegen.sh | 6 ++++-- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'bruiser') diff --git a/bruiser/makefile b/bruiser/makefile index 3f38539..393a7ae 100644 --- a/bruiser/makefile +++ b/bruiser/makefile @@ -21,7 +21,7 @@ TBG_OBJLIST_INC=$(patsubst ./luatablegen/%.c, ./luatablegen/%.o, $(wildcard ./lu ######################################RULES#################################### .DEFAULT: all -.PHONY: all clean help tablegen +.PHONY: all clean help all: $(BRUISER) @@ -46,8 +46,13 @@ dependc:.dependc linenoise.o: $(CC) $(CC_FLAGS) linenoise/linenoise.c -c -o linenoise.o -tablegen: - ../extra-tools/tablegen-test/run.sh +./wasmtablegen.json: + if [[ ls -l ./luatablegen | wc -l == 2 ]];then ./tablegen.sh;else :;fi + +./luatablegen/%.c: ./wasmtablegen.json + ./tablegen.sh + +./luatablegen/%.o:./luatablegen/%.c $(MAKE) -C luatablegen $(LIB_LUA): @@ -59,6 +64,7 @@ $(LIB_LUA_JIT): @echo "building with jit" $(BRUISER): $(BRUISER).o ../mutator_aux.o ../tinyxml2/tinyxml2.o linenoise.o CompletionHints.o mutagen.o ORCmutation.o bruiserffi.o asmrewriter.o bruisercapstone.o ramdump.o ffs.o $(LIB_LUA) $(TBG_OBJLIST_INC) + @echo $(TBG_OBJLIST_INC) $(CXX) $^ $(LD_FLAGS) -o $@ clean: diff --git a/bruiser/tablegen.sh b/bruiser/tablegen.sh index 5172d60..03a660c 100755 --- a/bruiser/tablegen.sh +++ b/bruiser/tablegen.sh @@ -1,5 +1,7 @@ #!/usr/bin/bash cd $(dirname $0) ../extra-tools/luatablegen.py --tbg ./wasmtablegen.json --out ./luatablegen --luaheader ../lua-5.3.4/src --pre ./luatablegen/wasmheader.txt --headeraggr ./luatablegen/wasm_tables.h --lualibpath ./lua-scripts/wasm.lua -make -C ./luatablegen -make clean +if [[ $1 == test ]]; then + make -C ./luatablegen + make clean +fi -- cgit v1.2.3