summaryrefslogtreecommitdiff
path: root/erlang.mk
diff options
context:
space:
mode:
authorLoïc Hoguin <lhoguin@vmware.com>2022-05-31 14:47:42 +0200
committerLoïc Hoguin <lhoguin@vmware.com>2022-05-31 14:47:42 +0200
commitb705ce6e43b65422d60fc9e217fb32050bd2534a (patch)
treef905ef91ce29fa6ca600b4a9c10a1e7723ce0b50 /erlang.mk
parentfa6b9f07670f90f413a85457c4785186025cf79d (diff)
downloadrabbitmq-server-git-b705ce6e43b65422d60fc9e217fb32050bd2534a.tar.gz
Update Erlang.mk to get latest Xref fixesloic-xref
Diffstat (limited to 'erlang.mk')
-rw-r--r--erlang.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/erlang.mk b/erlang.mk
index 8bbf8f005c..acbd80d4ce 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -17,7 +17,7 @@
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
export ERLANG_MK_FILENAME
-ERLANG_MK_VERSION = 2022.05.31-4-ga310407-dirty
+ERLANG_MK_VERSION = bf7a194
ERLANG_MK_WITHOUT =
# Make 3.81 and 3.82 are deprecated.
@@ -7886,9 +7886,9 @@ define xref.erl
true -> Res0;
false ->
lists:filter(fun(R) ->
- {Mod, MFA} = case R of
- {MFA0 = {M, _, _}, _} -> {M, MFA0};
- {M, _, _} -> {M, R}
+ {Mod, InMFA, MFA} = case R of
+ {InMFA0 = {M, _, _}, MFA0} -> {M, InMFA0, MFA0};
+ {M, _, _} -> {M, R, R}
end,
Attrs = try
Mod:module_info(attributes)
@@ -7926,7 +7926,8 @@ define xref.erl
true -> [$(XREF_IGNORE)]
end,
Ignores = InlineIgnores ++ BuiltinIgnores ++ CallbackIgnores ++ WideIgnores,
- not (lists:member(MFA, Ignores)
+ not (lists:member(InMFA, Ignores)
+ orelse lists:member(MFA, Ignores)
orelse lists:member({Mod, '_', '_'}, Ignores))
end, Res0)
end,