aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-03-07 18:10:35 +0100
committerMicael Karlberg <[email protected]>2019-04-30 10:58:16 +0200
commitf69742b7ed7fe843f6ca44179675b9d9bc63efdc (patch)
treeaf4d2a73d4e313edc5e0afdcf63b719baf7543a3 /lib/sasl
parent9e34d5b91fda4c1021090fa00a8921cc2c8d2cb8 (diff)
downloadotp-f69742b7ed7fe843f6ca44179675b9d9bc63efdc.tar.gz
otp-f69742b7ed7fe843f6ca44179675b9d9bc63efdc.tar.bz2
otp-f69742b7ed7fe843f6ca44179675b9d9bc63efdc.zip
[socket] Socket module to be optional
The SASL file systools_make has a hardcoded list of the preloaded modules (yuck). This now can handle that the socket module has been disabled (this is temporary). OTP-15658
Diffstat (limited to 'lib/sasl')
-rw-r--r--lib/sasl/src/Makefile4
-rw-r--r--lib/sasl/src/systools_make.erl9
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index 7338bdf016..fd62588f5c 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -61,7 +61,11 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
# ----------------------------------------------------
# FLAGS
# ----------------------------------------------------
+
ERL_COMPILE_FLAGS += -I../../stdlib/include -Werror
+ifeq ($(USE_ESOCK), yes)
+ERL_COMPILE_FLAGS += -DUSE_ESOCK=true
+endif
# ----------------------------------------------------
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index c2c91fd667..29395b3c82 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -45,6 +45,13 @@
-compile({inline,[{badarg,2}]}).
+-ifdef(USE_ESOCK).
+-define(ESOCK_MODS, [socket]).
+-else.
+-define(ESOCK_MODS, []).
+-endif.
+
+
%%-----------------------------------------------------------------
%% Create a boot script from a release file.
%% Options is a list of {path, Path} | silent | local
@@ -1566,7 +1573,7 @@ preloaded() ->
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,socket,zlib].
+ prim_inet,prim_zip] ++ ?ESOCK_MODS ++ [zlib].
%%______________________________________________________________________
%% Kernel processes; processes that are specially treated by the init