aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-03-19 18:19:49 +0100
committerMicael Karlberg <[email protected]>2019-04-30 10:58:16 +0200
commitb6c6aba478e314f60647bf2868eb4ebc59d3c719 (patch)
tree042ad1f482213150815293a73393df9ee2c07ec3 /erts/emulator
parent953f39ad8ce262d1104bd7e29338e43153bbd123 (diff)
downloadotp-b6c6aba478e314f60647bf2868eb4ebc59d3c719.tar.gz
otp-b6c6aba478e314f60647bf2868eb4ebc59d3c719.tar.bz2
otp-b6c6aba478e314f60647bf2868eb4ebc59d3c719.zip
[socket|net] Final prep
The config options --[en|dis]able-esock now works as expected.
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/Makefile.in35
1 files changed, 27 insertions, 8 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 1c85c4e827..a9f3bb8e89 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -633,6 +633,15 @@ GENERATE += $(TTF_DIR)/driver_tab.c
# This list must be consistent with PRE_LOADED_MODULES in
# erts/preloaded/src/Makefile.
+ifeq ($(USE_ESOCK), yes)
+ESOCK_PRELOAD_BEAM = \
+ $(ERL_TOP)/erts/preloaded/ebin/socket.beam \
+ $(ERL_TOP)/erts/preloaded/ebin/net.beam
+else
+ESOCK_PRELOAD_BEAM = \
+ $(ERL_TOP)/erts/preloaded/ebin/net.beam
+endif
+
PRELOAD_BEAM = $(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
$(ERL_TOP)/erts/preloaded/ebin/erl_init.beam \
$(ERL_TOP)/erts/preloaded/ebin/init.beam \
@@ -641,8 +650,7 @@ PRELOAD_BEAM = $(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
$(ERL_TOP)/erts/preloaded/ebin/prim_inet.beam \
$(ERL_TOP)/erts/preloaded/ebin/prim_file.beam \
$(ERL_TOP)/erts/preloaded/ebin/zlib.beam \
- $(ERL_TOP)/erts/preloaded/ebin/socket.beam \
- $(ERL_TOP)/erts/preloaded/ebin/net.beam \
+ $(ESOCK_PRELOAD_BEAM) \
$(ERL_TOP)/erts/preloaded/ebin/prim_zip.beam \
$(ERL_TOP)/erts/preloaded/ebin/erl_prim_loader.beam \
$(ERL_TOP)/erts/preloaded/ebin/erlang.beam \
@@ -835,6 +843,15 @@ EMU_OBJS = \
$(OBJDIR)/beam_catches.o $(OBJDIR)/code_ix.o \
$(OBJDIR)/beam_ranges.o
+
+ifeq ($(USE_ESOCK), yes)
+
+# WE ARE USING ESOCK
+
+ESOCK_NIF_OBJS = \
+ $(OBJDIR)/socket_nif.o \
+ $(OBJDIR)/net_nif.o
+
ifneq ($(TARGET), win32)
# These are *currently* only needed for non-win32,
# since the nif-functions for socket and net are basically
@@ -843,18 +860,20 @@ ESOCK_RUN_OBJS = \
$(OBJDIR)/socket_dbg.o \
$(OBJDIR)/socket_tarray.o \
$(OBJDIR)/socket_util.o
-ifeq ($(USE_ESOCK), yes)
-ESOCK_NIF_OBJS = \
- $(OBJDIR)/socket_nif.o \
- $(OBJDIR)/net_nif.o
else
-ESOCK_NIF_OBJS = \
- $(OBJDIR)/net_nif.o
+ESOCK_RUN_OBJS =
endif
+
else
+
+# WE ARE *NOT* USING ESOCK
+
+ESOCK_NIF_OBJS =
ESOCK_RUN_OBJS =
+
endif
+
RUN_OBJS += \
$(OBJDIR)/erl_alloc.o $(OBJDIR)/erl_mtrace.o \
$(OBJDIR)/erl_alloc_util.o $(OBJDIR)/erl_goodfit_alloc.o \