aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src/systools_make.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-07-08 15:28:16 +0200
committerMicael Karlberg <[email protected]>2019-07-08 15:28:16 +0200
commitb40524bc9c0be4c11da28435e497c2a7c1f5368e (patch)
tree9533fd449457ece7da3a20b19017c441111fd780 /lib/sasl/src/systools_make.erl
parent0199fc732374d0aab3b30a7153f62b03b3b39680 (diff)
parentf967324f020808955465a0714d9b0704d1c1d82c (diff)
downloadotp-b40524bc9c0be4c11da28435e497c2a7c1f5368e.tar.gz
otp-b40524bc9c0be4c11da28435e497c2a7c1f5368e.tar.bz2
otp-b40524bc9c0be4c11da28435e497c2a7c1f5368e.zip
Merge branch 'bmk/erts/esock/20190614/split_modules/OTP-15765' into maint
Diffstat (limited to 'lib/sasl/src/systools_make.erl')
-rw-r--r--lib/sasl/src/systools_make.erl10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index b5a6b44f93..c5d4b9bef3 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -47,9 +47,11 @@
-compile({inline,[{badarg,2}]}).
-ifdef(USE_ESOCK).
--define(ESOCK_MODS, [socket]).
+-define(ESOCK_SOCKET_MODS, [socket]).
+-define(ESOCK_NET_MODS, [prim_net]).
-else.
--define(ESOCK_MODS, []).
+-define(ESOCK_SOCKET_MODS, []).
+-define(ESOCK_NET_MODS, []).
-endif.
@@ -1573,8 +1575,8 @@ preloaded() ->
[atomics,counters,erl_init,erl_prim_loader,erl_tracer,erlang,
erts_code_purger,erts_dirty_process_signal_handler,
erts_internal,erts_literal_area_collector,
- init,net,persistent_term,prim_buffer,prim_eval,prim_file,
- prim_inet,prim_zip] ++ ?ESOCK_MODS ++ [zlib].
+ init,persistent_term,prim_buffer,prim_eval,prim_file,
+ prim_inet] ++ ?ESOCK_NET_MODS ++ [prim_zip] ++ ?ESOCK_SOCKET_MODS ++ [zlib].
%%______________________________________________________________________
%% Kernel processes; processes that are specially treated by the init