diff options
| author | Kjell Winblad <[email protected]> | 2019-04-10 15:50:54 +0200 |
|---|---|---|
| committer | Kjell Winblad <[email protected]> | 2019-04-10 15:50:54 +0200 |
| commit | 3d712ffc9d08dad3a42ea988869eaef8cd99b53b (patch) | |
| tree | 25ce2b16b9f847088997b0d4e77af46dbb6d2d66 /erts/emulator/Makefile.in | |
| parent | 326c3cb70c1b37c794b781a42c50725766098810 (diff) | |
| parent | c5e9766712436bea2b91bccd062f66a3ad1841bb (diff) | |
| download | otp-3d712ffc9d08dad3a42ea988869eaef8cd99b53b.tar.gz otp-3d712ffc9d08dad3a42ea988869eaef8cd99b53b.tar.bz2 otp-3d712ffc9d08dad3a42ea988869eaef8cd99b53b.zip | |
Merge branch 'kjell/stdlib/ets_decentralized_counters/PR-2190/OTP-15623'
* kjell/stdlib/ets_decentralized_counters/PR-2190/OTP-15623:
Decentralized counters for ETS ordered_set with write_concurrency
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 21351df656..448f41b523 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -894,7 +894,7 @@ 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)/erl_db_catree.o \ - $(ESOCK_RUN_OBJS) + $(ESOCK_RUN_OBJS) $(OBJDIR)/erl_flxctr.o LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o |