Fixed conflict error with Ragel on Bazel 0.25.

6 years ago · 61034f50b3
parent 6c1b78f095
commit 61034f50b3
2 changed files with 3 additions and 3 deletions
--- a/4
+++ b/4
@ -543,8 +543,8 @@ genrule(
    name = "generate_json_ragel",
    srcs = ["upb/json/parser.rl"],
    outs = ["upb/json/parser.c"],
-    cmd = "$(location @ragel//:ragel) -C -o upb/json/parser.c $< && mv upb/json/parser.c $@",
-    tools = ["@ragel"],
+    cmd = "$(location @ragel//:ragelc) -C -o upb/json/parser.c $< && mv upb/json/parser.c $@",
+    tools = ["@ragel//:ragelc"],
 )

 genrule(
--- a/ragel.BUILD
+++ b/ragel.BUILD
@ -4,7 +4,7 @@ package(
 )

 cc_binary(
-    name = "ragel",
+    name = "ragelc",
    srcs = [
        "ragel/rubycodegen.cpp",
        "ragel/goipgoto.h",