diff options
| author | Micael Karlberg <[email protected]> | 2019-05-02 10:16:04 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-05-02 10:16:04 +0200 |
| commit | 5c3b8ece50b2dfa66351198375acf4a5f08833ac (patch) | |
| tree | 2d1d42872f10a68656793638c460c3f76859a8c5 /lib | |
| parent | 202ac7dcd4060b463a08d6bca09529c95d5855f4 (diff) | |
| parent | b49f68d5d8a256a7a0847d939b2da8a4be6c728a (diff) | |
| download | otp-5c3b8ece50b2dfa66351198375acf4a5f08833ac.tar.gz otp-5c3b8ece50b2dfa66351198375acf4a5f08833ac.tar.bz2 otp-5c3b8ece50b2dfa66351198375acf4a5f08833ac.zip | |
Merge branch 'bmk/erts/esock/20190430/configure_esock_include/OTP-15658'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sasl/src/Makefile | 4 | ||||
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 10 |
2 files changed, 13 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..b5a6b44f93 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -33,6 +33,7 @@ -export([read_application/4]). -export([make_hybrid_boot/4]). +-export([preloaded/0]). % Exported just for testing -import(lists, [filter/2, keysort/2, keysearch/3, map/2, reverse/1, append/1, foldl/3, member/2, foreach/2]). @@ -45,6 +46,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 +1574,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 |