diff options
| author | John Högberg <[email protected]> | 2017-09-06 12:42:28 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-06 13:48:51 +0200 |
| commit | 0cc04010ae73fcb591be4f35c00eb61b653cc0d0 (patch) | |
| tree | 01f3790ea5682742297cb786cd676fb49ae21dc0 /erts/emulator/Makefile.in | |
| parent | 28759f8cbde480be7782bac9169eeb9e4fb60bce (diff) | |
| parent | ad5d9eef3f41274f08008cdbb43afb2088d3276e (diff) | |
| download | otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.tar.gz otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.tar.bz2 otp-0cc04010ae73fcb591be4f35c00eb61b653cc0d0.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index cdc14a0c8b..5215a12e58 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -810,7 +810,8 @@ RUN_OBJS = \ $(OBJDIR)/erl_bif_binary.o $(OBJDIR)/erl_ao_firstfit_alloc.o \ $(OBJDIR)/erl_thr_queue.o $(OBJDIR)/erl_sched_spec_pre_alloc.o \ $(OBJDIR)/erl_ptab.o $(OBJDIR)/erl_map.o \ - $(OBJDIR)/erl_msacc.o $(OBJDIR)/erl_lock_flags.o + $(OBJDIR)/erl_msacc.o $(OBJDIR)/erl_lock_flags.o \ + $(OBJDIR)/erl_io_queue.o LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o NIF_OBJS = $(OBJDIR)/erl_tracer_nif.o |