diff options
| author | Micael Karlberg <[email protected]> | 2019-01-30 14:17:52 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-01-30 14:17:52 +0100 |
| commit | 060338c0a6904cc4aaf5226dc7fb321ad3d23862 (patch) | |
| tree | c086567f871c61a583cbb57aea3695283b98f589 /erts/emulator/Makefile.in | |
| parent | 3d166efe4f3ee6a93edf361a9d72633a00fb486f (diff) | |
| download | otp-060338c0a6904cc4aaf5226dc7fb321ad3d23862.tar.gz otp-060338c0a6904cc4aaf5226dc7fb321ad3d23862.tar.bz2 otp-060338c0a6904cc4aaf5226dc7fb321ad3d23862.zip | |
[socket-nif] Preliminary windows adaptions
Added preliminary, and temporary, windows adaptions.
Basically they amount to letting all nif-callback functions
returning badarg for all calls if on windows (this has
been accomplished by if-defing the nif-code; if win32 then
badarg else do-something).
OTP-15526
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 1964d27134..adb4867e62 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -833,6 +833,18 @@ EMU_OBJS = \ $(OBJDIR)/beam_catches.o $(OBJDIR)/code_ix.o \ $(OBJDIR)/beam_ranges.o +ifneq ($(TARGET), win32) +# These are *currently* only needed for non-win32, +# since the nif-functions for socket and net are basically +# stubbed with badarg in the win32 case. +ESOCK_RUN_OBJS = \ + $(OBJDIR)/socket_dbg.o \ + $(OBJDIR)/socket_tarray.o \ + $(OBJDIR)/socket_util.o +else +ESOCK_RUN_OBJS = +endif + RUN_OBJS += \ $(OBJDIR)/erl_alloc.o $(OBJDIR)/erl_mtrace.o \ $(OBJDIR)/erl_alloc_util.o $(OBJDIR)/erl_goodfit_alloc.o \ @@ -878,17 +890,17 @@ RUN_OBJS += \ $(OBJDIR)/erl_ptab.o $(OBJDIR)/erl_map.o \ $(OBJDIR)/erl_msacc.o $(OBJDIR)/erl_lock_flags.o \ $(OBJDIR)/erl_io_queue.o \ - $(OBJDIR)/socket_dbg.o $(OBJDIR)/socket_tarray.o \ - $(OBJDIR)/socket_util.o + $(ESOCK_RUN_OBJS) LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o + NIF_OBJS = \ - $(OBJDIR)/erl_tracer_nif.o \ - $(OBJDIR)/prim_buffer_nif.o \ - $(OBJDIR)/prim_file_nif.o \ - $(OBJDIR)/socket_nif.o \ - $(OBJDIR)/net_nif.o \ - $(OBJDIR)/zlib_nif.o + $(OBJDIR)/erl_tracer_nif.o \ + $(OBJDIR)/prim_buffer_nif.o \ + $(OBJDIR)/prim_file_nif.o \ + $(OBJDIR)/zlib_nif.o \ + $(OBJDIR)/socket_nif.o \ + $(OBJDIR)/net_nif.o ifeq ($(TARGET),win32) DRV_OBJS = \ |