diff options
| author | Micael Karlberg <[email protected]> | 2019-07-08 15:28:44 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-07-08 15:28:44 +0200 |
| commit | 4c06ed65cb06f13f836d0d05ac8274557963a6f6 (patch) | |
| tree | fd1e5bbda74838d177237003811feb7022b986e1 /erts/emulator/Makefile.in | |
| parent | 231b555feb463550864c7b4767dd07df07b4b287 (diff) | |
| parent | b40524bc9c0be4c11da28435e497c2a7c1f5368e (diff) | |
| download | otp-4c06ed65cb06f13f836d0d05ac8274557963a6f6.tar.gz otp-4c06ed65cb06f13f836d0d05ac8274557963a6f6.tar.bz2 otp-4c06ed65cb06f13f836d0d05ac8274557963a6f6.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 46df9b8bc3..a8b1728b90 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -636,10 +636,9 @@ GENERATE += $(TTF_DIR)/driver_tab.c ifeq ($(USE_ESOCK), yes) ESOCK_PRELOAD_BEAM = \ $(ERL_TOP)/erts/preloaded/ebin/socket.beam \ - $(ERL_TOP)/erts/preloaded/ebin/net.beam + $(ERL_TOP)/erts/preloaded/ebin/prim_net.beam else -ESOCK_PRELOAD_BEAM = \ - $(ERL_TOP)/erts/preloaded/ebin/net.beam +ESOCK_PRELOAD_BEAM = endif PRELOAD_BEAM = $(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \ @@ -850,7 +849,7 @@ ifeq ($(USE_ESOCK), yes) ESOCK_NIF_OBJS = \ $(OBJDIR)/socket_nif.o \ - $(OBJDIR)/net_nif.o + $(OBJDIR)/prim_net_nif.o ifneq ($(TARGET), win32) # These are *currently* only needed for non-win32, |