diff options
| author | John Högberg <[email protected]> | 2017-09-06 12:54:50 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-06 12:54:56 +0200 |
| commit | 5900bd977164eba24311bbf9995a4e313d4013a7 (patch) | |
| tree | 297589a2598bb3ae0381cd7e05d9b7be0c05e637 /erts/emulator/Makefile.in | |
| parent | ad5d9eef3f41274f08008cdbb43afb2088d3276e (diff) | |
| parent | 2dc225ed172419066c8b3f54441ec14ffc2b0908 (diff) | |
| download | otp-5900bd977164eba24311bbf9995a4e313d4013a7.tar.gz otp-5900bd977164eba24311bbf9995a4e313d4013a7.tar.bz2 otp-5900bd977164eba24311bbf9995a4e313d4013a7.zip | |
Merge branch 'john/erts/zlib-nif/OTP-14185' into maint
OTP-14527
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 cc1fa571df..1916b97a89 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -819,14 +819,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 = \ @@ -856,7 +857,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 |