diff options
| author | Lukas Larsson <[email protected]> | 2019-04-18 14:24:31 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-04-18 14:24:31 +0200 |
| commit | 659ed4c005bb8c943c217d52383c219c0998aafa (patch) | |
| tree | 1a92dbdc38bd517027c1f3e08edfea9afdcdd423 /Makefile.in | |
| parent | d0482d868f4662ebebeb115878ea1f99da69f062 (diff) | |
| parent | bc39fa234dd2d2834985dcdd37159cbc9e4d8a51 (diff) | |
| download | otp-659ed4c005bb8c943c217d52383c219c0998aafa.tar.gz otp-659ed4c005bb8c943c217d52383c219c0998aafa.tar.bz2 otp-659ed4c005bb8c943c217d52383c219c0998aafa.zip | |
Merge branch 'lukas/OTP-22-rc2/misc-fixes/OTP-15773'
* lukas/OTP-22-rc2/misc-fixes/OTP-15773:
erts: Yield correctly when iterating over distr exit messages
erts: Fix cerl -rr to use correct etp file
erts: Fix etp-process-info to print exiting and free processes
tools: Adjust instrument abort tc to better trigger faults
erts: Fix cleanup of message factory undo
erts: Make dump_SUITE:free_dump not dump via rpc
erts: Add extra debugging to dist frag testcases
erts: Run smaller dist frag test to 32 bit machines
erl_docgen: Remove accidentally merged debug printout
erts: Fix z_SUITE to always look for cerl in ERL_TOP
otp: make top Makefile app target respect TYPE variable
vxworks: Make vxworks configure use environment CFLAGS
erts: Make erts_free debug failure easier to diagnose
erts: Fix gcc warning in to_erl
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 6cbd92a55b..25003f47a9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -485,11 +485,11 @@ libs: ifeq ($(OTP_SMALL_BUILD),true) $(make_verbose)cd lib && \ ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \ - $(MAKE) opt + $(MAKE) $(TYPE) else $(make_verbose)cd lib && \ ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \ - $(MAKE) opt BUILD_ALL=true + $(MAKE) $(TYPE) BUILD_ALL=true $(V_at)test -f $(ERL_TOP)/make/otp_built || echo "OTP built" > $(ERL_TOP)/make/otp_built endif @@ -498,7 +498,7 @@ APPS=$(patsubst $(ERL_TOP)/lib/%/doc,%,$(wildcard $(ERL_TOP)/lib/*/doc)) $(APPS): $(make_verbose)cd lib/$@ && \ ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \ - $(MAKE) opt BUILD_ALL=true + $(MAKE) $(TYPE) BUILD_ALL=true preloaded: $(make_verbose)cd erts/preloaded/src && \ |