root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fixup backport

This commit is contained in:
Rin Kuryloski 2024-06-19 13:59:29 +02:00
parent 306c593085
commit f73af61077
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/rabbit/BUILD.bazel vendored
View File

@ -249,10 +249,6 @@ plt(
], ],
for_target = ":erlang_app", for_target = ":erlang_app",
ignore_warnings = True, ignore_warnings = True,
<<<<<<< HEAD
=======
libs = ["@rules_elixir//elixir"], # keep
>>>>>>> 5debebfaf3 (Use rules_elixir to build the cli without mix)
plt = "//:base_plt", plt = "//:base_plt",
deps = [ deps = [
"@looking_glass//:erlang_app", # keep "@looking_glass//:erlang_app", # keep

2
deps/rabbitmq_amqp1_0/BUILD.bazel vendored
View File

@ -71,7 +71,7 @@ plt(
], ],
for_target = ":erlang_app", for_target = ":erlang_app",
ignore_warnings = True, ignore_warnings = True,
libs = ["//deps/rabbitmq_cli:elixir"], # keep libs = ["@rules_elixir//elixir"], # keep
plt = "//:base_plt", plt = "//:base_plt",
deps = ["//deps/rabbitmq_cli:erlang_app"], # keep deps = ["//deps/rabbitmq_cli:erlang_app"], # keep
) )