aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-06-03 16:11:15 +0200
committerFredrik Gustafsson <[email protected]>2013-06-03 16:11:15 +0200
commit46c45db2558cda8e36dc7d977db722b1b8d8c86f (patch)
tree65c03ebbb51bce37721aefb8ffd7aab122ae0552 /lib/sasl/src
parent7628e12e131be700af0b695d03e4cd1d73d03d6b (diff)
parent833600ed0a140983eaa87810131356739f8484ff (diff)
downloadotp-46c45db2558cda8e36dc7d977db722b1b8d8c86f.tar.gz
otp-46c45db2558cda8e36dc7d977db722b1b8d8c86f.tar.bz2
otp-46c45db2558cda8e36dc7d977db722b1b8d8c86f.zip
Merge branch 'nox/erl_eval-receive/OTP-11137' into maint
* nox/erl_eval-receive/OTP-11137: Updated primary bootstrap for erl_eval Added preloaded prim_eval Fix receive support in erl_eval with a BEAM module
Diffstat (limited to 'lib/sasl/src')
-rw-r--r--lib/sasl/src/systools_make.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 193dbb64bf..b2e95fdbee 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1461,8 +1461,8 @@ mandatory_modules() ->
preloaded() ->
%% Sorted
- [erl_prim_loader,erlang,erts_internal,init,otp_ring0,prim_file,prim_inet,
- prim_zip,zlib].
+ [erl_prim_loader,erlang,erts_internal,init,otp_ring0,prim_eval,prim_file,
+ prim_inet,prim_zip,zlib].
%%______________________________________________________________________
%% Kernel processes; processes that are specially treated by the init