diff options
| author | Micael Karlberg <[email protected]> | 2019-06-17 18:14:29 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-06-20 18:07:08 +0200 |
| commit | 55685630a4c2edccda1954e4bfb2ee590a4467f9 (patch) | |
| tree | 4c62debf40736a8985b569cc382d09b06bf42932 /erts/preloaded | |
| parent | fdffb35fc3209e20459a03fc21924295b96becee (diff) | |
| download | otp-55685630a4c2edccda1954e4bfb2ee590a4467f9.tar.gz otp-55685630a4c2edccda1954e4bfb2ee590a4467f9.tar.bz2 otp-55685630a4c2edccda1954e4bfb2ee590a4467f9.zip | |
[esock] Documentation woes
Still trying to make --disable-esock to work properly.
Now the primary chore is the doc building.
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; |