diff options
| author | Rickard Green <[email protected]> | 2014-03-20 17:10:32 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-03-20 17:10:32 +0100 |
| commit | 3c06b5b3cdde72453d97910889e38e91c1dd4870 (patch) | |
| tree | 1e58ec80f38cdea611b1ce297a1826ee869de605 /erts/Makefile.in | |
| parent | a50d7e892e3b2b3c8241eabd6bd0121672a6720f (diff) | |
| parent | e0052804daa336e0d05b8a451e15b07afd085074 (diff) | |
| download | otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.tar.gz otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.tar.bz2 otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.zip | |
Merge branch 'rickard/runtime-dep/OTP-11773'
* rickard/runtime-dep/OTP-11773:
Introduce system_information:sanity_check()
Verify runtime_dependencies when running 'otp_build patch_app'
Add test-case verifying runtime dependencies found by xref
Introduce runtime_dependencies in .app files
Bump versions and ensure that all are "normal" versions
Diffstat (limited to 'erts/Makefile.in')
| -rw-r--r-- | erts/Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/Makefile.in b/erts/Makefile.in index e3db37d3fd..47298cccba 100644 --- a/erts/Makefile.in +++ b/erts/Makefile.in @@ -48,6 +48,7 @@ debug opt clean: ( cd $$d && $(MAKE) $@ FLAVOR=$(FLAVOR) ) || exit $$? ; \ fi ; \ done + (cd preloaded/src && $(MAKE) ../ebin/erts.app) # ---------------------------------------------------------------------- # These are "convenience targets", provided as shortcuts for developers @@ -135,6 +136,10 @@ release: ( cd $$d && $(MAKE) $@ ) || exit $$? ; \ fi ; \ done + ( $(MAKE) -f "$(ERL_TOP)/make/otp_released_app.mk" \ + APP_PWD="$(ERL_TOP)/erts" APP_VSN=VSN APP=erts \ + TESTROOT="$(TESTROOT)" update) \ + || exit $$? .PHONY: release_docs release_docs: |