diff options
| author | Micael Karlberg <[email protected]> | 2019-06-24 12:41:29 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-06-24 12:41:29 +0200 |
| commit | 668459d13317e3c463f295b1c96125cfe0666e4b (patch) | |
| tree | dfc12435fe1a196b84c4e121400bf6cea647b4ac /erts/preloaded | |
| parent | 2c08787a53d30bb60d2b604eedb19389dc5a0d9e (diff) | |
| parent | 878741953069a8d0a7d683cf2b7cbbfe957e880d (diff) | |
| download | otp-668459d13317e3c463f295b1c96125cfe0666e4b.tar.gz otp-668459d13317e3c463f295b1c96125cfe0666e4b.tar.bz2 otp-668459d13317e3c463f295b1c96125cfe0666e4b.zip | |
Merge branch 'bmk/esock/20190614/fix-net-docbuilding' into bmk/erts/esock/20190614/split_modules/OTP-15765
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erl_init.beam | bin | 2316 -> 2336 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erl_init.erl | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erl_init.beam b/erts/preloaded/ebin/erl_init.beam Binary files differindex 1d54e0cead..bc7639781c 100644 --- a/erts/preloaded/ebin/erl_init.beam +++ b/erts/preloaded/ebin/erl_init.beam diff --git a/erts/preloaded/src/erl_init.erl b/erts/preloaded/src/erl_init.erl index 9fcb3969e4..dadf7dda6f 100644 --- a/erts/preloaded/src/erl_init.erl +++ b/erts/preloaded/src/erl_init.erl @@ -50,7 +50,9 @@ run(M, F, A) -> end. conditional_load(CondMod, Mods2Load) -> - conditional_load(CondMod, erlang:loaded(), Mods2Load). + Loaded = erlang:loaded(), + %% erlang:display({?MODULE, conditional_load, Loaded}), + conditional_load(CondMod, Loaded, Mods2Load). conditional_load(_CondMod, [], _Mods2LOad) -> ok; |