diff options
| author | Richard Carlsson <[email protected]> | 2018-05-24 14:31:40 +0200 |
|---|---|---|
| committer | Richard Carlsson <[email protected]> | 2018-05-24 14:31:40 +0200 |
| commit | 218646bd9c446cd6b2f1ebfd7d75ec682d8168f1 (patch) | |
| tree | f77a785de36246fc6a181604e048b9135f4db06b /erts/preloaded | |
| parent | f18549cf0ab10e553da0f4f839c72370a304c10f (diff) | |
| download | otp-218646bd9c446cd6b2f1ebfd7d75ec682d8168f1.tar.gz otp-218646bd9c446cd6b2f1ebfd7d75ec682d8168f1.tar.bz2 otp-218646bd9c446cd6b2f1ebfd7d75ec682d8168f1.zip | |
Move calling on_load for preloaded modules to erl_init
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/erl_init.erl | 6 | ||||
| -rw-r--r-- | erts/preloaded/src/init.erl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/preloaded/src/erl_init.erl b/erts/preloaded/src/erl_init.erl index f43e060438..d681f05398 100644 --- a/erts/preloaded/src/erl_init.erl +++ b/erts/preloaded/src/erl_init.erl @@ -30,6 +30,12 @@ Mod :: module(), BootArgs :: [binary()]. start(Mod, BootArgs) -> + %% Load the static nifs + zlib:on_load(), + erl_tracer:on_load(), + prim_buffer:on_load(), + prim_file:on_load(), + %% Proceed to the specified boot module run(Mod, boot, BootArgs). run(M, F, A) -> diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 9e3de87e08..69637d1295 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -200,12 +200,6 @@ boot(BootArgs) -> register(init, self()), process_flag(trap_exit, true), - %% Load the static nifs - zlib:on_load(), - erl_tracer:on_load(), - prim_buffer:on_load(), - prim_file:on_load(), - {Start0,Flags,Args} = parse_boot_args(BootArgs), %% We don't get to profile parsing of BootArgs case b2a(get_flag(profile_boot, Flags, false)) of |