diff options
| author | Micael Karlberg <[email protected]> | 2019-07-08 15:28:16 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-07-08 15:28:16 +0200 |
| commit | b40524bc9c0be4c11da28435e497c2a7c1f5368e (patch) | |
| tree | 9533fd449457ece7da3a20b19017c441111fd780 /erts/preloaded/src/Makefile | |
| parent | 0199fc732374d0aab3b30a7153f62b03b3b39680 (diff) | |
| parent | f967324f020808955465a0714d9b0704d1c1d82c (diff) | |
| download | otp-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 'erts/preloaded/src/Makefile')
| -rw-r--r-- | erts/preloaded/src/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 27d450c873..e1bb2ee5c4 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -36,10 +36,9 @@ include $(ERL_TOP)/lib/kernel/vsn.mk ifeq ($(USE_ESOCK), yes) PRE_LOADED_ERL_ESOCK_MODULES = \ socket \ - net + prim_net else -PRE_LOADED_ERL_ESOCK_MODULES = \ - net +PRE_LOADED_ERL_ESOCK_MODULES = endif PRE_LOADED_ERL_MODULES = \ @@ -82,9 +81,9 @@ APP_FILE= erts.app APP_SRC= $(APP_FILE).src APP_TARGET= $(STATIC_EBIN)/$(APP_FILE) ifeq ($(USE_ESOCK), yes) -APP_ESOCK_MODS= net, socket +APP_ESOCK_MODS= prim_net, socket else -APP_ESOCK_MODS= net +APP_ESOCK_MODS= endif |