aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-23 10:39:29 +0100
committerSiri Hansen <[email protected]>2012-03-23 10:39:29 +0100
commit95b0ebeede7ac325288ab5f7e98e95ab2b860b3a (patch)
treea5f7e318cea66f57ec6d22b106400a5a0089c799 /lib/sasl/src
parent7b05df099767f1c17d9b84cb3cc695cf4fcf0f88 (diff)
parentf4a9831c176b3d477077a4e508e24777b2bf0342 (diff)
downloadotp-95b0ebeede7ac325288ab5f7e98e95ab2b860b3a.tar.gz
otp-95b0ebeede7ac325288ab5f7e98e95ab2b860b3a.tar.bz2
otp-95b0ebeede7ac325288ab5f7e98e95ab2b860b3a.zip
Merge branch 'siri/sasl/correct-app-name-in-error/OTP-9888' into maint
* siri/sasl/correct-app-name-in-error/OTP-9888: Fix error message if stdlib has faulty start type in .rel file
Diffstat (limited to 'lib/sasl/src')
-rw-r--r--lib/sasl/src/systools_make.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 3c1002e4a6..d8adfeb98f 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -482,7 +482,7 @@ mandatory_applications([_|Apps],Kernel,Stdlib,Sasl) ->
mandatory_applications([],Type,_,_) when Type=/=permanent ->
error_mandatory_application(kernel,Type);
mandatory_applications([],_,Type,_) when Type=/=permanent ->
- error_mandatory_application(sasl,Type);
+ error_mandatory_application(stdlib,Type);
mandatory_applications([],_,_,undefined) ->
{ok, [{warning,missing_sasl}]};
mandatory_applications([],_,_,_) ->