diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2015-07-07 13:08:08 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2015-07-07 13:08:08 -0700 |
commit | 36962f137f9b77db33051d7165fe064be5dbe9bd (patch) | |
tree | ae7246f75ed80826cb8d3fb7121ca7c1ddef6b40 /Makefile | |
parent | ff8b042ad310f105249eeab761427669d6fe9766 (diff) | |
parent | b354ead7efbaba80569e3a6f80865b715aaa6315 (diff) |
Merge pull request #31 from haberman/third_party
Moved DynASM to third_party to comply with Google policy.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -182,7 +182,7 @@ obj/upb/pb/compile_decoder_x64.lo : CSTD = -std=gnu89 upb/pb/compile_decoder_x64.h: upb/pb/compile_decoder_x64.dasc $(E) DYNASM $< - $(Q) $(LUA) dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) + $(Q) $(LUA) third_party/dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) endif upb_json_SRCS = \ @@ -256,7 +256,7 @@ upb/descriptor/descriptor.pb: upb/descriptor/descriptor.proto genfiles: upb/descriptor/descriptor.pb tools/upbc ./tools/upbc upb/descriptor/descriptor.pb upb/descriptor/descriptor google_protobuf_descriptor - $(LUA) dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) + $(LUA) third_party/dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false) # upbc depends on these Lua extensions. UPBC_LUA_EXTS = \ |