diff options
| author | Lukas Larsson <[email protected]> | 2019-03-25 18:00:40 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-03-25 18:00:40 +0100 |
| commit | 2e6166dbef6af554e623f8ddc59abc126f50c584 (patch) | |
| tree | 0088163d400598c7fe06af81e79ef4dcb4453568 /lib/wx | |
| parent | edb8aa4f76981c1f32c9b429f47ce30100126e58 (diff) | |
| parent | 922fd35583157596559227e0ec9e0163e8c3b9bc (diff) | |
| download | otp-2e6166dbef6af554e623f8ddc59abc126f50c584.tar.gz otp-2e6166dbef6af554e623f8ddc59abc126f50c584.tar.bz2 otp-2e6166dbef6af554e623f8ddc59abc126f50c584.zip | |
Merge branch 'lukas/erts/fragment-dist-messages/OTP-13397/OTP-15610/OTP-15611/OTP-15612/OTP-15613/OTP-15703'
* lukas/erts/fragment-dist-messages/OTP-13397/OTP-15610/OTP-15611/OTP-15612/OTP-15613/OTP-15703: (26 commits)
erts: Yield when exiting/free process is suspended by de
doc: Fix Design Princ, statem incorrect anchor
erts: Include external msg in need of GC
erts: Include dist header in return from dist_ctrl_get_data
erts: Fix so that exit/down terms stay alive
erts: Pending signals can be for free processes
erts: Fix faulty assert in reference_table_term
etp: Don't crash etp-stack* when c_p->i is null
erts: Adjust dist obuf size correctly after hdr fin
erts: Fix non-payload dist exit signals
erts: Always do trylock on proc locks when crash dumping
Fix tests to work better in debug emulator
erts: erts_factory_proc_init should not set hole marker
erts: Skip heavy process tab tests in debug emu
ts: Use same dynlinking logic for all bsd
Revert "erts: Always run fds check after each testcase"
erts: Always run fds check after each testcase
erts: Always stop any testnodes before testcase exits
erts: Add crash dumping of EXITING and FREE processes
wx: Remove ERL_FLAGS from Makefile erlc command
...
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/src/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile index 21b45af2c4..52f4008e0a 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -111,10 +111,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk Makefile # Rules $(EBIN)/%.beam: $(ESRC)/%.erl $(HEADER_FILES) - $(V_ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $< + $(V_ERLC) -W -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $< $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) - $(V_ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $< + $(V_ERLC) -W -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $< # ---------------------------------------------------- # Release Target |