diff options
| author | John Högberg <[email protected]> | 2017-09-06 13:50:33 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-06 13:50:33 +0200 |
| commit | 8c71ed08ea176713de8a6c15ca7616e1ef1be8a0 (patch) | |
| tree | 561464e723b066b6cba2e27f2b1c57cb55340365 /erts/emulator/Makefile.in | |
| parent | 0cc04010ae73fcb591be4f35c00eb61b653cc0d0 (diff) | |
| parent | 5900bd977164eba24311bbf9995a4e313d4013a7 (diff) | |
| download | otp-8c71ed08ea176713de8a6c15ca7616e1ef1be8a0.tar.gz otp-8c71ed08ea176713de8a6c15ca7616e1ef1be8a0.tar.bz2 otp-8c71ed08ea176713de8a6c15ca7616e1ef1be8a0.zip | |
Merge branch 'maint' into john/erts/merge-zlib-and-vector-q
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 5215a12e58..4e98184c4e 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -814,14 +814,15 @@ RUN_OBJS = \ $(OBJDIR)/erl_io_queue.o LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o -NIF_OBJS = $(OBJDIR)/erl_tracer_nif.o +NIF_OBJS = \ + $(OBJDIR)/erl_tracer_nif.o \ + $(OBJDIR)/zlib_nif.o ifeq ($(TARGET),win32) DRV_OBJS = \ $(OBJDIR)/registry_drv.o \ $(OBJDIR)/efile_drv.o \ $(OBJDIR)/inet_drv.o \ - $(OBJDIR)/zlib_drv.o \ $(OBJDIR)/ram_file_drv.o \ $(OBJDIR)/ttsl_drv.o OS_OBJS = \ @@ -851,7 +852,6 @@ OS_OBJS = \ DRV_OBJS = \ $(OBJDIR)/efile_drv.o \ $(OBJDIR)/inet_drv.o \ - $(OBJDIR)/zlib_drv.o \ $(OBJDIR)/ram_file_drv.o \ $(OBJDIR)/ttsl_drv.o endif |