summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2013-05-11 18:48:23 -0700
committerJoshua Haberman <jhaberman@gmail.com>2013-05-11 18:48:23 -0700
commit622481990b17bed5e6fd69a1cab5d5f20413be79 (patch)
tree66c06c24d09d8a8c70895c07eabd26ddedb78f5e /Makefile
parent70293f5faabe08fc9bdef26ad0b1d6afe19e8f79 (diff)
Updated benchmarks to new APIs.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 787b2cd..bd4fda9 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ CXXFLAGS=-Ibindings/cpp
INCLUDE=-Itests -I.
CPPFLAGS=$(INCLUDE) -Wall -Wextra -Wno-sign-compare $(USER_CFLAGS)
LDLIBS=-lpthread upb/libupb.a
-LUA=lua5.1 # 5.1 and 5.2 should both be supported
+LUA=lua # 5.1 and 5.2 should both be supported
# Build with "make Q=" to see all commands that are being executed.
Q=@
@@ -173,7 +173,7 @@ upb/def.lo: upb/def.c
upb/pb/decoder_x64.h: upb/pb/decoder_x64.dasc
$(E) DYNASM $<
- $(Q) $(LUA) dynasm/dynasm.lua upb/pb/decoder_x64.dasc > upb/pb/decoder_x64.h
+ $(Q) $(LUA) dynasm/dynasm.lua upb/pb/decoder_x64.dasc > upb/pb/decoder_x64.h || (rm upb/pb/decoder_x64.h ; false)
ifneq ($(shell uname), Darwin)
upb/pb/jit_debug_elf_file.o: upb/pb/jit_debug_elf_file.s
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback