diff options
| author | John Högberg <[email protected]> | 2017-09-06 12:38:05 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-06 12:38:05 +0200 |
| commit | ad5d9eef3f41274f08008cdbb43afb2088d3276e (patch) | |
| tree | 9d3263d517f6e3c20a5f2f855673f20efc302c9f /erts/emulator/Makefile.in | |
| parent | 7394b41b9f254c7f83d508cfc615bd1d63a84507 (diff) | |
| parent | eed25a02ba2416c48587699542aaecdd09609718 (diff) | |
| download | otp-ad5d9eef3f41274f08008cdbb43afb2088d3276e.tar.gz otp-ad5d9eef3f41274f08008cdbb43afb2088d3276e.tar.bz2 otp-ad5d9eef3f41274f08008cdbb43afb2088d3276e.zip | |
Merge branch 'lukas/erts/nif_vector_q/OTP-14598' into maint
OTP-14520
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 1ae905276d..cc1fa571df 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -815,7 +815,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 |