aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-11-11 15:00:33 +0100
committerSiri Hansen <[email protected]>2016-11-11 15:00:33 +0100
commit699ee018507109534a42fa2c618b5a4945158aa2 (patch)
treeeeaa2d744c774c36c9fee7b5a38f4570605f903e /lib/sasl/src
parenta541c1a5ee3a3edac0fd4b7186c01db98b2cf279 (diff)
parente1f43b3c3550e8d01aeaaaeef284ed0b1da7d5c3 (diff)
downloadotp-699ee018507109534a42fa2c618b5a4945158aa2.tar.gz
otp-699ee018507109534a42fa2c618b5a4945158aa2.tar.bz2
otp-699ee018507109534a42fa2c618b5a4945158aa2.zip
Merge branch 'tsloughter/mod_app/PR-1222/OTP-14029'
* tsloughter/mod_app/PR-1222/OTP-14029: Accept default value of 'start_phases' and 'mod' in .app
Diffstat (limited to 'lib/sasl/src')
-rw-r--r--lib/sasl/src/systools_make.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index efe6cc9eb4..6a16c8689e 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -643,6 +643,8 @@ get_items([], _Dict) ->
check_item({_,{mod,{M,A}}},_) when is_atom(M) ->
{M,A};
+check_item({_,{mod,[]}},_) -> % default mod is [], so accept as entry
+ [];
check_item({_,{vsn,Vsn}},I) ->
case string_p(Vsn) of
true -> Vsn;
@@ -678,6 +680,8 @@ check_item({_,{modules,Mods}},I) ->
true -> Mods;
_ -> throw({bad_param, I})
end;
+check_item({_,{start_phases,undefined}},_) -> % default start_phase is undefined,
+ undefined; % so accept as entry
check_item({_,{start_phases,Phase}},I) ->
case t_list_p(Phase) of
true -> Phase;